Browse Source

Add Android project configuration files and update Gradle settings for Java 21 compatibility

- Introduced new configuration files: AndroidProjectSystem.xml, deploymentTargetSelector.xml, and runConfigurations.xml.
- Updated compiler settings to target Java 21 in compiler.xml and misc.xml.
- Adjusted Kotlin plugin version in kotlinc.xml.
- Modified Gradle settings to use Java 19 for compile options across multiple build.gradle.kts files.
- Updated dependencies in libs.versions.toml for compatibility with the latest libraries.
- Upgraded Gradle wrapper to version 8.11.1.
codeskraps 6 days ago
parent
commit
d446d75c7c

+ 6 - 0
.idea/AndroidProjectSystem.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AndroidProjectSystem">
+    <option name="providerId" value="com.android.tools.idea.GradleProjectSystem" />
+  </component>
+</project>

+ 1 - 1
.idea/compiler.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="17" />
+    <bytecodeTargetLevel target="21" />
   </component>
 </project>

+ 10 - 0
.idea/deploymentTargetSelector.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="deploymentTargetSelector">
+    <selectionStates>
+      <SelectionState runConfigName="app">
+        <option name="selectionMode" value="DROPDOWN" />
+      </SelectionState>
+    </selectionStates>
+  </component>
+</project>

+ 1 - 1
.idea/gradle.xml

@@ -15,6 +15,7 @@
             </builds>
           </compositeBuild>
         </compositeConfiguration>
+        <option name="testRunner" value="CHOOSE_PER_TEST" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="gradleJvm" value="#GRADLE_LOCAL_JAVA_HOME" />
         <option name="modules">
@@ -32,7 +33,6 @@
             <option value="$PROJECT_DIR$/feature/weather" />
           </set>
         </option>
-        <option name="resolveExternalAnnotations" value="false" />
       </GradleProjectSettings>
     </option>
   </component>

+ 1 - 1
.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.9.22" />
+    <option name="version" value="2.1.20" />
   </component>
 </project>

+ 2 - 1
.idea/misc.xml

@@ -1,6 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="ExternalStorageConfigurationManager" enabled="true" />
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

+ 17 - 0
.idea/runConfigurations.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RunConfigurationProducerService">
+    <option name="ignoredProducers">
+      <set>
+        <option value="com.intellij.execution.junit.AbstractAllInDirectoryConfigurationProducer" />
+        <option value="com.intellij.execution.junit.AllInPackageConfigurationProducer" />
+        <option value="com.intellij.execution.junit.PatternConfigurationProducer" />
+        <option value="com.intellij.execution.junit.TestInClassConfigurationProducer" />
+        <option value="com.intellij.execution.junit.UniqueIdConfigurationProducer" />
+        <option value="com.intellij.execution.junit.testDiscovery.JUnitTestDiscoveryConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinJUnitRunConfigurationProducer" />
+        <option value="org.jetbrains.kotlin.idea.junit.KotlinPatternConfigurationProducer" />
+      </set>
+    </option>
+  </component>
+</project>

+ 3 - 3
app/build.gradle.kts

@@ -43,11 +43,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
     buildFeatures {
         compose = true

+ 3 - 3
core/local/build.gradle.kts

@@ -32,11 +32,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
 }
 

+ 3 - 3
core/location/build.gradle.kts

@@ -32,11 +32,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
 }
 

+ 3 - 3
feature/common/build.gradle.kts

@@ -31,11 +31,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
     buildFeatures {
         compose = true

+ 3 - 3
feature/geocoding/build.gradle.kts

@@ -34,11 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
     buildFeatures {
         compose = true

+ 3 - 3
feature/maps/build.gradle.kts

@@ -33,11 +33,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
     buildFeatures {
         compose = true

+ 3 - 3
feature/weather/build.gradle.kts

@@ -34,11 +34,11 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility = ConfigData.javaVersion
-        targetCompatibility = ConfigData.javaVersion
+        sourceCompatibility = JavaVersion.VERSION_19
+        targetCompatibility = JavaVersion.VERSION_19
     }
     kotlinOptions {
-        jvmTarget = ConfigData.javaTarget
+        jvmTarget = JavaVersion.VERSION_19.toString()
     }
     buildFeatures {
         compose = true

+ 20 - 20
gradle/libs.versions.toml

@@ -1,29 +1,29 @@
 [versions]
-androidxComposeBom = "2024.02.02"
-androidGradlePlugin = "8.3.0"
-ktx = "1.12.0"
-compose = "1.8.2"
+androidxComposeBom = "2025.03.01"
+androidGradlePlugin = "8.9.1"
+ktx = "1.15.0"
+compose = "1.10.1"
 immutable = "0.3.7"
-location = "21.2.0"
+location = "21.3.0"
 hilt = "2.51"
 hilt-navigation = "1.2.0"
-navigationCompose = "2.7.7"
-lyfecyleCompose = "2.7.0"
-retrofit = "2.9.0"
+navigationCompose = "2.8.9"
+lyfecyleCompose = "2.8.7"
+retrofit = "2.11.0"
 junit = "4.13.2"
-junittest = "1.1.5"
-espresso = "3.5.1"
-coroutines = "1.7.3"
+junittest = "1.2.1"
+espresso = "3.6.1"
+coroutines = "1.8.1"
 room = "2.6.1"
-material = "1.6.3"
-material3 = "1.2.1"
-org-jetbrains-kotlin-android = "1.9.22"
-appcompat = "1.6.1"
-com-google-android-material-material = "1.11.0"
-ksp = "1.9.22-1.0.17"
-animationGraphicsAndroid = "1.6.3"
-play-services-maps = "18.2.0"
-maps-compose = "4.3.0"
+material = "1.7.8"
+material3 = "1.3.1"
+org-jetbrains-kotlin-android = "2.1.20"
+appcompat = "1.7.0"
+com-google-android-material-material = "1.12.0"
+ksp = "2.1.20-1.0.32"
+animationGraphicsAndroid = "1.7.8"
+play-services-maps = "19.1.0"
+maps-compose = "4.4.1"
 secretsGradlePlugin = "2.0.1"
 
 

+ 2 - 2
gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Oct 06 11:44:37 CEST 2023
+#Mon Apr 07 18:52:49 CEST 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists