From 3ef5a894db348248dfa64130629f80a350eb407a Mon Sep 17 00:00:00 2001 From: Damyan Ivanov Date: Tue, 9 Jun 2020 19:32:13 +0000 Subject: [PATCH] upgrade build environment and libraries --- app/build.gradle | 14 +++++++------- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 4385164a..f5b092c5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -39,32 +39,32 @@ android { } } sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/'] } } - buildToolsVersion '28.0.3' + buildToolsVersion '29.0.3' compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } productFlavors { } - viewBinding.enabled = true + buildFeatures.viewBinding = true } dependencies { - def nav_version = '2.3.0-alpha06' + def nav_version = '2.3.0-beta01' implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.2.0-alpha06' + implementation 'com.google.android.material:material:1.3.0-alpha01' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' testImplementation 'junit:junit:4.13' - androidTestImplementation 'androidx.test:runner:1.3.0-beta01' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-beta01' + androidTestImplementation 'androidx.test:runner:1.3.0-rc01' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0-rc01' implementation 'org.jetbrains:annotations:15.0' implementation 'com.fasterxml.jackson.module:jackson-modules-java8:2.11.0' implementation "androidx.navigation:navigation-fragment:$nav_version" implementation "androidx.navigation:navigation-ui:$nav_version" - implementation 'androidx.appcompat:appcompat:1.2.0-beta01' + implementation 'androidx.appcompat:appcompat:1.3.0-alpha01' } allprojects { diff --git a/build.gradle b/build.gradle index ba600f47..24248a8d 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.3' + classpath 'com.android.tools.build:gradle:4.0.0' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1cf7ec7e..c3af6bce 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 14 18:00:21 EET 2020 +#Mon Jun 08 21:33:09 EEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip -- 2.39.5