Update build tools

ademar111190 · Jul 25, 2024 · 14715fc · 14715fc
1 parent c054d2c
commit 14715fc
Show file tree

Hide file tree

Showing 6 changed files with 40 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,16 +1,18 @@
-apply plugin: 'com.android.application'
+plugins {
+    id "com.android.application"
+}
 
 android {
     compileSdkVersion 34
     defaultConfig {
         applicationId "ademar.textlauncher"
         minSdkVersion 14
         targetSdkVersion 34
-        versionCode 9
-        versionName "1.4.0"
+        versionCode 10
+        versionName "1.4.1"
     }
     buildTypes {
-        configureEach {
+        release {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
@@ -22,3 +24,9 @@ android {
     }
     namespace "ademar.textlauncher"
 }
+
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17)
+    }
+}
diff --git a/build.gradle b/build.gradle
@@ -1,18 +1,6 @@
-buildscript {
-    repositories {
-        google()
-        mavenCentral()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.2'
-    }
-}
-
-allprojects {
-    repositories {
-        google()
-        mavenCentral()
-    }
+plugins {
+    // https://maven.google.com/web/index.html
+    id "com.android.application" version "8.5.1" apply false
 }
 
 tasks.register('clean', Delete) {

diff --git a/fastlane/metadata/android/en-US/changelogs/10.txt b/fastlane/metadata/android/en-US/changelogs/10.txt
@@ -0,0 +1 @@
+- Update build tools
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,3 @@
-android.defaults.buildfeatures.buildconfig=true
 android.nonFinalResIds=false
 android.nonTransitiveRClass=false
 org.gradle.jvmargs=-Xmx32g
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1,24 @@
+pluginManagement {
+    repositories {
+        google()
+        mavenCentral()
+        gradlePluginPortal()
+    }
+}
+
+plugins {
+    // https://kotl.in/gradle/jvm/toolchain
+    id "org.gradle.toolchains.foojay-resolver-convention" version "0.8.0"
+}
+
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+    }
+}
+
+rootProject.name = "Text Launcher"
+
 include ':app'