From bf4451bcfdd9d8bec30302f762e300c9cf522154 Mon Sep 17 00:00:00 2001 From: Rasoul Miri Date: Wed, 5 Dec 2018 16:24:53 +0330 Subject: [PATCH] update gradle to 3.2.1 and support to 28 --- .idea/caches/build_file_checksums.ser | Bin 0 -> 585 bytes .idea/codeStyles/Project.xml | 29 ++++++++++++ .idea/compiler.xml | 22 --------- .idea/copyright/profiles_settings.xml | 3 -- .idea/dictionaries/Sky.xml | 7 --- .idea/inspectionProfiles/Project_Default.xml | 8 ++-- .../inspectionProfiles/profiles_settings.xml | 7 --- .idea/misc.xml | 44 ++++-------------- .idea/vcs.xml | 2 +- build.gradle | 7 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- library/build.gradle | 20 +++----- sample/build.gradle | 18 +++---- 13 files changed, 67 insertions(+), 102 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/copyright/profiles_settings.xml delete mode 100644 .idea/dictionaries/Sky.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..18ffef08cfc5fac3fba8a2949f76edc095d63557 GIT binary patch literal 585 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}nf0c10SK(>-0m(oSKZ~Sp>4=KT*QK zlLYcFOjjX89RnLk;qe+t!I-5UJMW66WUhI+ucU-QASXXLF$WY{1*t_PnW@F4aK(Er zH{P1{d5Y)nYrDF>|IXqpVGzm5Oe#t&s?^7B`oHP1(`~;bG&RM&J@WXDuY3uEa4|3h zb5e1rw_I?q<&A26Y&zTi=^I~8_bOpf(GM+7Eh^Rz&aTvlI$j?UpBOH@BHMGbpJ5Zr k%LdLFZ+k literal 0 HcmV?d00001 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/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 96cc43e..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index e7bedf3..0000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - \ No newline at end of file diff --git a/.idea/dictionaries/Sky.xml b/.idea/dictionaries/Sky.xml deleted file mode 100644 index 8751b7d..0000000 --- a/.idea/dictionaries/Sky.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - rmiri - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml index 21c9e4f..14a8bba 100644 --- a/.idea/inspectionProfiles/Project_Default.xml +++ b/.idea/inspectionProfiles/Project_Default.xml @@ -1,10 +1,10 @@ \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b31283..0000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 7158618..e0d5b93 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,62 +1,38 @@ - - - - - - - - - - - - - - + - - - - - 1.8 - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index 94a25f7..35eb1dd 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/build.gradle b/build.gradle index c2eea8e..06174e5 100644 --- a/build.gradle +++ b/build.gradle @@ -2,10 +2,11 @@ buildscript { repositories { + google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -14,7 +15,11 @@ buildscript { allprojects { repositories { + google() jcenter() + maven { + url 'https://maven.google.com/' + } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 3133fe7..2e72964 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip diff --git a/library/build.gradle b/library/build.gradle index 24e182f..bdc6398 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,17 +1,15 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { minSdkVersion 17 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" - } buildTypes { release { @@ -22,12 +20,8 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('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.+' - compile 'com.android.support:cardview-v7:25.+' - compile 'com.android.support:design:25.+' - testCompile 'junit:junit:4.12' + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:28.+' + implementation 'com.android.support:cardview-v7:28.+' + implementation 'com.android.support:design:28.+' } diff --git a/sample/build.gradle b/sample/build.gradle index a5fe289..545bae8 100644 --- a/sample/build.gradle +++ b/sample/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion '25.0.2' + compileSdkVersion 28 + buildToolsVersion '28.0.3' defaultConfig { applicationId "io.rmiri.skeleton" minSdkVersion 17 - targetSdkVersion 25 + targetSdkVersion 28 versionCode 1 versionName "1.0.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -24,10 +24,10 @@ android { } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - compile 'com.android.support:appcompat-v7:25.+' - compile 'com.android.support:cardview-v7:25.+' - compile 'com.android.support:design:25.+' - compile 'com.squareup.picasso:picasso:2.3.2' - compile project(':library') + implementation fileTree(include: ['*.jar'], dir: 'libs') + implementation 'com.android.support:appcompat-v7:28.+' + implementation 'com.android.support:cardview-v7:28.+' + implementation 'com.android.support:design:28.+' + implementation 'com.squareup.picasso:picasso:2.3.2' + implementation project(':library') }