From ac6f13ecf94ca057987522bcadfbbcbeed49d134 Mon Sep 17 00:00:00 2001 From: Roman Tsisyk Date: Sun, 12 Nov 2023 19:42:21 +0200 Subject: [PATCH] Rehydrate Signed-off-by: Roman Tsisyk --- build.gradle | 7 +++---- gradle/wrapper/gradle-wrapper.properties | 6 +++--- lib/build.gradle | 3 +-- sample-app-capitals/build.gradle | 1 - sample-pick-point/build.gradle | 1 - 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index de88b5a..5b13a97 100644 --- a/build.gradle +++ b/build.gradle @@ -1,13 +1,12 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { - id 'com.android.application' version '7.4.2' apply false - id 'com.android.library' version '7.4.2' apply false + id 'com.android.application' version '8.1.2' apply false + id 'com.android.library' version '8.1.2' apply false } project.ext { minSdkVersion = 21 - targetSdkVersion = 33 - buildToolsVersion = '33.0.2' + targetSdkVersion = 34 javaVersion = JavaVersion.VERSION_11 } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 713a4c3..ef95097 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Fri Mar 24 10:19:21 EET 2023 +#Sun Nov 12 19:38:16 EET 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/lib/build.gradle b/lib/build.gradle index 1c40766..ed2ffc7 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -9,7 +9,6 @@ android { defaultConfig { minSdk project.minSdkVersion targetSdk project.targetSdkVersion - buildToolsVersion project.buildToolsVersion consumerProguardFiles "consumer-rules.pro" } @@ -32,5 +31,5 @@ tasks.withType(JavaCompile) { dependencies { implementation 'androidx.appcompat:appcompat:1.6.1' - implementation 'com.google.android.material:material:1.8.0' + implementation 'com.google.android.material:material:1.10.0' } diff --git a/sample-app-capitals/build.gradle b/sample-app-capitals/build.gradle index 5b6bc98..0792217 100644 --- a/sample-app-capitals/build.gradle +++ b/sample-app-capitals/build.gradle @@ -10,7 +10,6 @@ android { applicationId "app.organicmaps.api.sample.capitals" minSdk project.minSdkVersion targetSdk project.targetSdkVersion - buildToolsVersion project.buildToolsVersion versionCode 1 versionName "1.0" } diff --git a/sample-pick-point/build.gradle b/sample-pick-point/build.gradle index ec02207..9ec838e 100644 --- a/sample-pick-point/build.gradle +++ b/sample-pick-point/build.gradle @@ -10,7 +10,6 @@ android { applicationId "app.organicmaps.api.sample.pick_point" minSdk project.minSdkVersion targetSdk project.targetSdkVersion - buildToolsVersion project.buildToolsVersion versionCode 1 versionName "1.0" }