From ccc764a4aa42c2715c48aa806504149a695e60f6 Mon Sep 17 00:00:00 2001
From: pahill <pamela.a.hill@gmail.com>
Date: Tue, 4 Mar 2025 12:24:17 +0200
Subject: [PATCH 1/2] Update project configurations to support JDK 11 and SDK
 35

Upgraded JVM target to 11, compileSdk and targetSdk to 35, and Kotlin to 2.1.10 for improved compatibility and performance. Updated Gradle wrapper, dependencies, and plugin versions to align with these changes. Minor IDE configuration adjustments were also made to reflect the new settings.
---
 .idea/gradle.xml                         |  2 ++
 .idea/kotlinc.xml                        |  2 +-
 .idea/misc.xml                           |  2 +-
 app/build.gradle.kts                     | 12 ++++++------
 gradle/libs.versions.toml                | 24 ++++++++++++------------
 gradle/wrapper/gradle-wrapper.properties |  2 +-
 6 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 4979975..dec7287 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -4,7 +4,9 @@
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
+        <option name="gradleJvm" value="17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
index 0fc3113..c22b6fa 100644
--- a/.idea/kotlinc.xml
+++ b/.idea/kotlinc.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="KotlinJpsPluginSettings">
-    <option name="version" value="1.8.10" />
+    <option name="version" value="2.1.10" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6ffffc4..a8cf6ba 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -3,7 +3,7 @@
   <component name="FrameworkDetectionExcludesConfiguration">
     <file type="web" url="file://$PROJECT_DIR$" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 0c56c9b..6e7da52 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -1,4 +1,4 @@
-import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11
 
 plugins {
     alias(libs.plugins.androidApplication)
@@ -7,17 +7,17 @@ plugins {
 
 kotlin {
     compilerOptions {
-        jvmTarget = JVM_1_8
+        jvmTarget = JVM_11
     }
 }
 
 android {
-    compileSdk = 34
+    compileSdk = 35
 
     defaultConfig {
         applicationId = "com.jetbrains.simplelogin.androidapp"
         minSdk = 21
-        targetSdk = 34
+        targetSdk = 35
         versionCode = 1
         versionName = "1.0"
 
@@ -34,8 +34,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = JavaVersion.VERSION_1_8
-        targetCompatibility = JavaVersion.VERSION_1_8
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
     }
     buildFeatures {
         viewBinding = true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index d0a7ce2..ca5b642 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,24 +1,24 @@
 [versions]
-android-gradlePlugin = "8.2.2"
-android-compileSdk = "34"
+android-gradlePlugin = "8.8.2"
+android-compileSdk = "35"
 android-minSdk = "24"
-android-targetSdk = "34"
-androidx-activityCompose = "1.9.0"
+android-targetSdk = "35"
+androidx-activityCompose = "1.10.1"
 androidx-appcompat = "1.7.0"
-androidx-constraintlayout = "2.1.4"
-androidx-core-ktx = "1.13.1"
+androidx-constraintlayout = "2.2.1"
+androidx-core-ktx = "1.15.0"
 androidx-espresso-core = "3.6.1"
 androidx-material = "1.12.0"
 androidx-test-junit = "1.2.1"
-annotation = "1.8.0"
-compose = "1.6.8"
+annotation = "1.9.1"
+compose = "1.7.8"
 compose-plugin = "1.6.10"
 imageLoader = "1.6.3"
 junit = "4.13.2"
-kotlin = "2.0.20"
-kotlinxCoroutinesCore = "1.8.0"
-ktor = "2.3.7"
-lifecycleLivedataKtx = "2.8.2"
+kotlin = "2.1.10"
+ktor = "3.1.0"
+kotlinxCoroutinesCore = "1.10.1"
+lifecycleLivedataKtx = "2.8.7"
 voyagerNavigator = "1.0.0"
 
 [libraries]
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 09523c0..df97d72 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

From afac9cd792bda386995d364ad862a9ef52534645 Mon Sep 17 00:00:00 2001
From: pahill <pamela.a.hill@gmail.com>
Date: Tue, 4 Mar 2025 13:18:03 +0200
Subject: [PATCH 2/2] Set minSdk version to 24 in build configuration

Updated the minimum SDK version from 21 to 24 to align with modern Android development practices and dependencies. This change ensures compatibility with newer libraries and features while dropping support for older SDK versions.
---
 app/build.gradle.kts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index 6e7da52..d9d0644 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -16,7 +16,7 @@ android {
 
     defaultConfig {
         applicationId = "com.jetbrains.simplelogin.androidapp"
-        minSdk = 21
+        minSdk = 24
         targetSdk = 35
         versionCode = 1
         versionName = "1.0"