AGP 9.0

app/build.gradle

@@ -1,8 +1,5 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget
-
 plugins {
     alias(libs.plugins.androidApplication)
-    alias(libs.plugins.jetbrainsKotlinAndroid)
     alias(libs.plugins.gradle.ktlint) version(libs.versions.ktlint)
     alias(libs.plugins.kotlin.ksp) version(libs.versions.ksp)
     alias(libs.plugins.jetbrainsComposeCompiler)
@@ -15,7 +12,6 @@ android {
     defaultConfig {
         applicationId "com.greenart7c3.nostrsigner"
         minSdk 26
-        targetSdk 36
         versionCode 172
         versionName "4.1.1"
 
@@ -95,6 +91,11 @@ android {
         arg("room.schemaLocation", "$projectDir/schemas")
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_21
+        targetCompatibility JavaVersion.VERSION_21
+    }
+
     if (System.getenv('SIGN_RELEASE')) {
         def keystorePropertiesFile = rootProject.file("keystore.properties")
         def keystoreProperties = new Properties()
@@ -129,11 +130,11 @@ android {
     flavorDimensions += "version"
 
     productFlavors {
-        create("free") {
+        register("free") {
             getIsDefault().set(true)
             dimension = "version"
         }
-        create("offline") {
+        register("offline") {
             dimension = "version"
         }
     }
@@ -155,6 +156,7 @@ android {
     buildFeatures {
         compose = true
         buildConfig = true
+        resValues = true
     }
 
     packagingOptions {
@@ -165,12 +167,6 @@ android {
     }
 }
 
-kotlin {
-    compilerOptions {
-        jvmTarget = JvmTarget.JVM_21
-    }
-}
-
 composeCompiler {
     reportsDestination = layout.buildDirectory.dir("compose_compiler")
 }

build.gradle

@@ -4,7 +4,6 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
     alias(libs.plugins.androidApplication) apply false
     alias(libs.plugins.androidLibrary) apply false
-    alias(libs.plugins.jetbrainsKotlinAndroid) apply false
     alias(libs.plugins.serialization) apply false
     alias(libs.plugins.kotlin.ksp) version(libs.versions.ksp) apply false
     alias(libs.plugins.gradle.ktlint) version(libs.versions.ktlint) apply false

gradle.properties

@@ -22,5 +22,4 @@ kotlin.code.style=official
 # thereby reducing the size of the R class for that library
 android.nonTransitiveRClass=true
 android.enableR8.fullMode=true
-android.nonFinalResIds=false
 org.gradle.configuration-cache=true

gradle/libs.versions.toml

@@ -1,5 +1,5 @@
 [versions]
-activityCompose = "1.12.2"
+activityCompose = "1.12.3"
 appcompat = "1.7.1"
 biometricKtx = "1.2.0-alpha05"
 core = "3.5.4"
@@ -10,25 +10,25 @@ junit = "4.13.2"
 junitVersion = "1.3.0"
 lifecycle_version = "2.10.0"
 material3 = "1.4.0"
-nav_version = "2.9.6"
+nav_version = "2.9.7"
 quartz = "1.05.1"
-compose_ui = "1.10.1"
+compose_ui = "1.10.2"
 richtextUi = "a02a03a3e9"
 roomKtx = "2.8.4"
 securityCryptoKtx = "1.1.0"
 zxingAndroidEmbedded = "4.3.0"
 okhttp = "5.3.2"
 kotlin = "2.3.0"
-workRuntimeKtx = "2.11.0"
-agp = "8.13.2"
+workRuntimeKtx = "2.11.1"
+agp = "9.0.0"
 ktlint = "14.0.1"
-ksp = "2.3.2"
+ksp = "2.3.5"
 coil = "3.3.0"
 storage = "2.2.0"
 jna = "5.18.1"
 materialIconsExtended = "1.7.8"
 collections = "0.4.0"
-pagingCommon = "3.3.6"
+pagingCommon = "3.4.0"
 
 [libraries]
 datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" }
@@ -79,7 +79,6 @@ paging-compose = { group = "androidx.paging", name = "paging-compose", version.r
 paging-runtime = { group = "androidx.paging", name = "paging-runtime", version.ref = "pagingCommon" }
 
 [plugins]
-jetbrainsKotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 androidLibrary = { id = "com.android.library", version.ref = "agp" }
 androidApplication = { id = "com.android.application", version.ref = "agp" }
 gradle_ktlint = { id = "org.jlleitschuh.gradle.ktlint", version = "ktlint" }