From 335ef9afe0f8760740f550e729c0c816681bbb61 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Wed, 6 May 2026 14:31:03 +0200 Subject: [PATCH 1/3] update deps and agp --- gradle.properties | 12 +++++++++++- gradle/libs.versions.toml | 14 +++++++------- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 19 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3c5031eb..a626f610 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,4 +20,14 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true \ No newline at end of file +android.nonTransitiveRClass=true +android.defaults.buildfeatures.resvalues=true +android.sdk.defaultTargetSdkToCompileSdkIfUnset=false +android.enableAppCompileTimeRClass=false +android.usesSdkInManifest.disallowed=false +android.uniquePackageNames=false +android.dependency.useConstraints=true +android.r8.strictFullModeForKeepRules=false +android.r8.optimizedResourceShrinking=false +android.builtInKotlin=false +android.newDsl=false \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 803ab78b..85a1a9fe 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,17 +1,17 @@ [versions] -agp = "8.13.2" -kotlin = "2.3.0" +agp = "9.2.1" +kotlin = "2.3.21" ksp = "2.3.4" -core-ktx = "1.17.0" +core-ktx = "1.18.0" lifecycle-runtime = "2.10.0" -activity-compose = "1.12.2" -datastore-preferences = "1.2.0" -compose-bom = "2026.01.00" +activity-compose = "1.13.0" +datastore-preferences = "1.2.1" +compose-bom = "2026.04.01" room = "2.8.4" sqlite = "3.49.0" -paging = "3.3.6" +paging = "3.4.2" compose-markdown = "0.5.8" # todo: remove this dep and use the standard one reimagined-navigation = "1.5.0" diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 8cc4a83a..6a9f410f 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Feb 28 02:22:38 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From da914689d919ba03188704ba24048d92f698eccd Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Thu, 7 May 2026 02:24:51 +0200 Subject: [PATCH 2/3] fix build --- app/build.gradle.kts | 25 ++++++++++++------------ build.gradle.kts | 1 - gradle.properties | 12 +----------- gradle/gradle-daemon-jvm.properties | 12 ++++++++++++ gradle/libs.versions.toml | 5 ++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 6 files changed, 29 insertions(+), 28 deletions(-) create mode 100644 gradle/gradle-daemon-jvm.properties diff --git a/app/build.gradle.kts b/app/build.gradle.kts index dfdcf2cd..20c4dc73 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -7,7 +7,6 @@ import java.time.format.DateTimeFormatter plugins { alias(libs.plugins.android.application) - alias(libs.plugins.kotlin.android) alias(libs.plugins.compose.compiler) // for room alias(libs.plugins.ksp) @@ -23,7 +22,9 @@ android { ndkVersion = "27.3.13750724" namespace = "io.github.wiiznokes.gitnote" - compileSdk = 36 + + // https://developer.android.com/about/versions + compileSdk = 37 dependenciesInfo { // Disables dependency metadata when building APKs (for IzzyOnDroid/F-Droid) @@ -49,7 +50,7 @@ android { applicationId = "io.github.wiiznokes.gitnote" minSdk = 30 - targetSdk = 36 + versionCode = 16 versionName = "26.03" @@ -116,16 +117,7 @@ android { } } - ksp { - arg("room.schemaLocation", "$projectDir/schemas") - } - kotlin { - compilerOptions { - // set the target JVM bytecode - jvmTarget.set(JvmTarget.JVM_21) - } - } buildFeatures { buildConfig = true @@ -139,9 +131,18 @@ android { } +ksp { + arg("room.schemaLocation", "$projectDir/schemas") +} + kotlin { // set what version of the jdk will be use to compile the code jvmToolchain(21) + + compilerOptions { + // set the target JVM bytecode + jvmTarget.set(JvmTarget.JVM_21) + } } dependencies { diff --git a/build.gradle.kts b/build.gradle.kts index 931ec3d2..530b68ca 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,7 +1,6 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. plugins { alias(libs.plugins.android.application) apply false - alias(libs.plugins.kotlin.android) apply false alias(libs.plugins.compose.compiler) apply false alias(libs.plugins.ksp) apply false } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index a626f610..3c5031eb 100644 --- a/gradle.properties +++ b/gradle.properties @@ -20,14 +20,4 @@ kotlin.code.style=official # Enables namespacing of each library's R class so that its R class includes only the # resources declared in the library itself and none from the library's dependencies, # thereby reducing the size of the R class for that library -android.nonTransitiveRClass=true -android.defaults.buildfeatures.resvalues=true -android.sdk.defaultTargetSdkToCompileSdkIfUnset=false -android.enableAppCompileTimeRClass=false -android.usesSdkInManifest.disallowed=false -android.uniquePackageNames=false -android.dependency.useConstraints=true -android.r8.strictFullModeForKeepRules=false -android.r8.optimizedResourceShrinking=false -android.builtInKotlin=false -android.newDsl=false \ No newline at end of file +android.nonTransitiveRClass=true \ 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 00000000..6c1139ec --- /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/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.FREE_BSD.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.LINUX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.LINUX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.MAC_OS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/73bcfb608d1fde9fb62e462f834a3299/redirect +toolchainUrl.MAC_OS.X86_64=https\://api.foojay.io/disco/v3.0/ids/846ee0d876d26a26f37aa1ce8de73224/redirect +toolchainUrl.UNIX.AARCH64=https\://api.foojay.io/disco/v3.0/ids/ec7520a1e057cd116f9544c42142a16b/redirect +toolchainUrl.UNIX.X86_64=https\://api.foojay.io/disco/v3.0/ids/4c4f879899012ff0a8b2e2117df03b0e/redirect +toolchainUrl.WINDOWS.AARCH64=https\://api.foojay.io/disco/v3.0/ids/9482ddec596298c84656d31d16652665/redirect +toolchainUrl.WINDOWS.X86_64=https\://api.foojay.io/disco/v3.0/ids/39701d92e1756bb2f141eb67cd4c660e/redirect +toolchainVersion=21 diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 85a1a9fe..11da765d 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -8,10 +8,10 @@ core-ktx = "1.18.0" lifecycle-runtime = "2.10.0" activity-compose = "1.13.0" datastore-preferences = "1.2.1" -compose-bom = "2026.04.01" +compose-bom = "2026.05.00" room = "2.8.4" sqlite = "3.49.0" -paging = "3.4.2" +paging = "3.5.0" compose-markdown = "0.5.8" # todo: remove this dep and use the standard one reimagined-navigation = "1.5.0" @@ -62,6 +62,5 @@ androidx-test-runner = { group = "androidx.test", name = "runner", version.ref = [plugins] android-application = { id = "com.android.application", version.ref = "agp" } -kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" } compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 6a9f410f..bc78cebc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Wed Feb 28 02:22:38 CET 2024 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.5.0-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists From 5bef453bc8cb7f5cbaf688166dfa1cc9187bbb55 Mon Sep 17 00:00:00 2001 From: wiiznokes <78230769+wiiznokes@users.noreply.github.com> Date: Thu, 7 May 2026 02:57:33 +0200 Subject: [PATCH 3/3] fix compile --- app/build.gradle.kts | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 20c4dc73..0ca196d1 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -185,6 +185,7 @@ dependencies { // unit test testImplementation(kotlin("test")) + testImplementation(kotlin("test-junit")) // integration test androidTestImplementation(composeBom)