From e9a2bfa53d163a98766655fb4b5f2213b6f35e4b Mon Sep 17 00:00:00 2001 From: fabioranieri Date: Mon, 29 Jun 2020 08:42:03 +0200 Subject: [PATCH] Add configuration for androidX --- app/build.gradle | 3 --- build.gradle | 14 +++++++------- gradle.properties | 5 ++++- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 13 insertions(+), 13 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index dd2bb8e..6df76ed 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,10 +1,7 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - apply plugin: 'kotlin-android-extensions' - android { compileSdkVersion compile_sdk_version defaultConfig { diff --git a/build.gradle b/build.gradle index 4912720..e38f497 100644 --- a/build.gradle +++ b/build.gradle @@ -2,7 +2,7 @@ buildscript { ext { - kotlin_version = '1.3.41' + kotlin_version = '1.3.72' gms_google_services = '4.2.0' } @@ -11,7 +11,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.5.0' + classpath 'com.android.tools.build:gradle:4.0.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "com.google.gms:google-services:$gms_google_services" @@ -30,11 +30,11 @@ allprojects { ext { - compile_sdk_version = 28 + compile_sdk_version = 29 application_id = "com.grumpyshoe.modules.pushmanager.sample" min_sdk_version = 16 - target_sdk_version = 28 - build_tools_version = "28.0.3" + target_sdk_version = 29 + build_tools_version = "29.0.2" version_code = 1 version_name = "1.2.2" @@ -43,8 +43,8 @@ allprojects { // google support appcompat : ("androidx.appcompat:appcompat:1.1.0"), - // firebase - firebase_core : ("com.google.firebase:firebase-core:17.2.0"), + // firebaseimplementation 'com.google.firebase:firebase-core:17.4.3' + firebase_core : ("com.google.firebase:firebase-core:17.4.3"), firebase_iid : ("com.google.firebase:firebase-iid:20.0.0"), firebase_messaging: ("com.google.firebase:firebase-messaging:20.0.0"), diff --git a/gradle.properties b/gradle.properties index b2b3bb2..beeba91 100644 --- a/gradle.properties +++ b/gradle.properties @@ -10,4 +10,7 @@ org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects -# org.gradle.parallel=true \ No newline at end of file +# org.gradle.parallel=true + +android.useAndroidX=true +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index da1ce2e..3536dff 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Aug 13 16:20:31 CEST 2018 +#Sat Jun 27 20:15:29 CEST 2020 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip