From d315f4e33e575b17c4f8b012342e39c558e4d071 Mon Sep 17 00:00:00 2001 From: afischerdev Date: Tue, 14 Mar 2023 14:14:59 +0100 Subject: [PATCH] gradle updates --- brouter-routing-app/build.gradle | 18 +++++++++--------- build.gradle | 2 +- gradle.properties | 3 ++- gradle/wrapper/gradle-wrapper.properties | 2 +- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/brouter-routing-app/build.gradle b/brouter-routing-app/build.gradle index 71dea8e..35405e3 100644 --- a/brouter-routing-app/build.gradle +++ b/brouter-routing-app/build.gradle @@ -5,7 +5,7 @@ plugins { } android { - compileSdkVersion 31 + compileSdkVersion 33 defaultConfig { applicationId "btools.routingapp" @@ -17,7 +17,7 @@ android { setProperty("archivesBaseName", "BRouterApp." + defaultConfig.versionName) minSdkVersion 14 - targetSdkVersion 30 + targetSdkVersion 33 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } @@ -84,10 +84,10 @@ android { } dependencies { - implementation 'androidx.appcompat:appcompat:1.4.1' - implementation "androidx.constraintlayout:constraintlayout:2.1.3" - implementation 'androidx.work:work-runtime:2.7.1' - implementation 'com.google.android.material:material:1.5.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation "androidx.constraintlayout:constraintlayout:2.1.4" + implementation 'androidx.work:work-runtime:2.8.0' + implementation 'com.google.android.material:material:1.8.0' implementation project(':brouter-mapaccess') implementation project(':brouter-core') @@ -96,9 +96,9 @@ dependencies { testImplementation 'junit:junit:4.13.2' - androidTestImplementation 'androidx.test.ext:junit:1.1.3' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0' - androidTestImplementation 'androidx.work:work-testing:2.7.1' + androidTestImplementation 'androidx.test.ext:junit:1.1.5' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1' + androidTestImplementation 'androidx.work:work-testing:2.8.0' } check.dependsOn 'checkstyle' diff --git a/build.gradle b/build.gradle index 8d58199..22579a5 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.2' + classpath 'com.android.tools.build:gradle:7.4.2' // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle.properties b/gradle.properties index 199d16e..147c25a 100644 --- a/gradle.properties +++ b/gradle.properties @@ -16,5 +16,6 @@ org.gradle.jvmargs=-Xmx1536m # https://developer.android.com/topic/libraries/support-library/androidx-rn android.useAndroidX=true # Automatically convert third-party libraries to use AndroidX -android.enableJetifier=true +android.enableJetifier=false + diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6df5e88..cdbfc5f 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-7.0.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip