diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 9c0abce..ae3d713 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -65,17 +65,7 @@ - - - - - - - - - - - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 8fea37c..44b1b2f 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,8 +3,11 @@ + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..35eb1dd --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 8c03504..8fbd34b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 25 - buildToolsVersion "24.0.2" + buildToolsVersion '27.0.3' defaultConfig { applicationId "com.zhouwei.md.materialdesignsamples" minSdkVersion 16 @@ -20,14 +20,14 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:25.0.0' - compile 'com.android.support:cardview-v7:25.0.0' - testCompile 'junit:junit:4.12' - compile 'com.android.support:design:25.0.0' - compile 'com.bigkoo:convenientbanner:2.0.0'//banner - compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3' + implementation 'com.android.support:appcompat-v7:25.0.0' + implementation 'com.android.support:cardview-v7:25.0.0' + androidTestImplementation 'junit:junit:4.12' + implementation 'com.android.support:design:25.0.0' + implementation 'com.bigkoo:convenientbanner:2.0.0'//banner + implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.3' } diff --git a/build.gradle b/build.gradle index c20bca1..95d0e7d 100644 --- a/build.gradle +++ b/build.gradle @@ -3,9 +3,10 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.2.2' + classpath 'com.android.tools.build:gradle:3.1.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 04e285f..d2fb67b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Dec 28 10:00:20 PST 2015 +#Fri May 18 11:00:05 CST 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip diff --git a/mdsimples/build.gradle b/mdsimples/build.gradle index 2c1097b..6aabeaf 100644 --- a/mdsimples/build.gradle +++ b/mdsimples/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'com.android.library' android { compileSdkVersion 24 - buildToolsVersion "24.0.2" + buildToolsVersion '27.0.3' defaultConfig { minSdkVersion 16 @@ -22,10 +22,10 @@ android { } dependencies { - compile fileTree(dir: 'libs', include: ['*.jar']) - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(dir: 'libs', include: ['*.jar']) + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile 'com.android.support:appcompat-v7:24.2.1' - testCompile 'junit:junit:4.12' + implementation 'com.android.support:appcompat-v7:24.2.1' + testImplementation 'junit:junit:4.12' }