From b6d95f92686a36cb03bb940e169a66e571b940f7 Mon Sep 17 00:00:00 2001 From: Hyperling Date: Sun, 1 Nov 2026 09:55:32 -0700 Subject: [PATCH] Update versions and migrate to Kotlin Compose so that app compiles successfully, otherwise was in a stuck failed state due to deprecations. --- app/build.gradle.kts | 32 +++++++++++++++--------- app/src/main/AndroidManifest.xml | 5 ++-- build.gradle.kts | 3 ++- gradle/gradle-daemon-jvm.properties | 12 +++++++++ gradle/libs.versions.toml | 20 +++++++-------- gradle/wrapper/gradle-wrapper.properties | 4 +-- 6 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 2a2f3e4..9bd012a 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -1,18 +1,19 @@ plugins { alias(libs.plugins.androidApplication) - alias(libs.plugins.jetbrainsKotlinAndroid) + //alias(libs.plugins.jetbrainsKotlinAndroid) + alias(libs.plugins.kotlinCompose) } android { namespace = "com.hyperling.tictactoe" - compileSdk = 36 + compileSdk = 37 defaultConfig { applicationId = "com.hyperling.tictactoe" - minSdk = 21 - targetSdk = 36 - versionCode = 4 - versionName = "1.1.0" + minSdk = 23 + targetSdk = 37 + versionCode = 5 + versionName = "1.1.1" testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" vectorDrawables { @@ -23,15 +24,16 @@ android { buildTypes { release { isMinifyEnabled = true - proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro") + isShrinkResources = true + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) } } compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - kotlinOptions { - jvmTarget = "1.8" + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 } buildFeatures { compose = true @@ -62,4 +64,10 @@ dependencies { androidTestImplementation(libs.androidx.ui.test.junit4) debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) + + // 2026-11-01 - Fix for "unresolved reference" on these in MainActivity: + //import androidx.compose.material.icons.Icons + //import androidx.compose.material.icons.rounded.Close + implementation("androidx.compose.material:material-icons-core") + implementation("androidx.compose.material:material-icons-extended") } \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a3e89b7..71f29cf 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,8 +10,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_icon_ttt" android:supportsRtl="true" - android:theme="@style/Theme.TicTacToe" - tools:targetApi="31"> + android:theme="@style/Theme.TicTacToe"> - \ No newline at end of file + diff --git a/build.gradle.kts b/build.gradle.kts index a0985ef..09c18ce 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,5 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.androidApplication) apply false - alias(libs.plugins.jetbrainsKotlinAndroid) apply false + //alias(libs.plugins.jetbrainsKotlinAndroid) apply false + alias(libs.plugins.kotlinCompose) apply false } \ No newline at end of file diff --git a/gradle/gradle-daemon-jvm.properties b/gradle/gradle-daemon-jvm.properties new file mode 100644 index 0000000..fa4ed51 --- /dev/null +++ b/gradle/gradle-daemon-jvm.properties @@ -0,0 +1,12 @@ +#This file is generated by updateDaemonJvm +toolchainUrl.FREE_BSD.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/c2dd35c9d0aaf0ba6ad0791320f99dfc/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/e5810bd7fd1f8a586644409d395a7e55/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/cf726b4a1c84b50457225f9bba6d7650/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/fa1e318c287360478e3c83a9a3ef1007/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/7b3c4877c0749019e6805bb61e421497/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/d76df094a9cbbabd3b08251f9e61444a/redirect +toolchainVersion=25 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 0ca22d3..2553441 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,13 +1,13 @@ [versions] -agp = "8.11.1" -kotlin = "1.9.0" -coreKtx = "1.10.1" +agp = "9.5.0" +kotlin = "2.4.21" +coreKtx = "1.19.1" junit = "4.13.2" -junitVersion = "1.1.5" -espressoCore = "3.5.1" -lifecycleRuntimeKtx = "2.6.1" -activityCompose = "1.7.0" -composeBom = "2023.08.00" +junitVersion = "1.3.0" +espressoCore = "3.7.0" +lifecycleRuntimeKtx = "2.11.0" +activityCompose = "1.13.0" +composeBom = "2026.09.00" [libraries] androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" } @@ -27,5 +27,5 @@ androidx-material3 = { group = "androidx.compose.material3", name = "material3" [plugins] androidApplication = { id = "com.android.application", version.ref = "agp" } -jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } - +#jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } +kotlinCompose = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fba3e42..bbb2c93 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sat Mar 30 12:28:25 MST 2024 +#Sun Nov 01 08:44:00 MST 2026 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.8.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists