From b97836c805a6dd945a4c8cbe0e1fded7649e130c Mon Sep 17 00:00:00 2001 From: Alina Date: Sun, 6 Jan 2019 14:28:12 +0200 Subject: [PATCH] update gradle --- .idea/caches/build_file_checksums.ser | Bin 0 -> 537 bytes .idea/codeStyles/Project.xml | 224 +++++++++++++++++++++++ .idea/codeStyles/codeStyleConfig.xml | 5 + app/build.gradle | 18 +- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 6 files changed, 241 insertions(+), 12 deletions(-) create mode 100644 .idea/caches/build_file_checksums.ser create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser new file mode 100644 index 0000000000000000000000000000000000000000..45f0e2076a2c9002aefff7826dd733b403f8e975 GIT binary patch literal 537 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}hO13-5Pg5>l-a(W(##Th_( zR`y#54~r#SWM*J;W8likPfT%3OfJbU@?_vF$tX%K&dAS6sVJ~_U;qK0at2z_zyOYkOxc*3?Qo+1h#i=)DS%NU!zsDz4YitIS!x` zi&INVGV{`lVHyh=>KNESYUkZd*k^N}Jx@15Pb%E$@WK)X9uynk3a2_dKCYV(6TGET zeElrtf_FgYAhoC@Gqt!Bu9(5Kma#B1eTQs3->Ukn6>2368qQWRp~b01 z#W9XKnR$sZP=~}I;s?W!E3!Q|`x!Q|ylmi{@#cq9T?vCA9@YB<{v0Urj@n$cO< IxG1Os0KrkYm;e9( literal 0 HcmV?d00001 diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..ad59454 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,224 @@ + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..8f1a3b7 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 08cc8b9..e88c5aa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 25 - buildToolsVersion "26.0.2" + compileSdkVersion 26 + buildToolsVersion '28.0.3' defaultConfig { applicationId "com.example.alina.tetris" minSdkVersion 21 - targetSdkVersion 25 + targetSdkVersion 26 versionCode 1 versionName "1.0" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" @@ -20,13 +20,13 @@ 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.4.0' - compile 'com.android.support.constraint:constraint-layout:1.0.2' - compile 'com.jakewharton:butterknife:8.8.1' + implementation 'com.android.support:appcompat-v7:26.1.0' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + implementation 'com.jakewharton:butterknife:8.8.1' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' - testCompile 'junit:junit:4.12' + testImplementation 'junit:junit:4.12' } diff --git a/build.gradle b/build.gradle index 7e01a0a..ae9fbaf 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + 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 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index dde72d2..4dfcffc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 03 19:13:53 EET 2018 +#Sun Dec 30 22:21:18 EET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip