From c727feaba8593b7d7ef9b823bd59490d21e08dee Mon Sep 17 00:00:00 2001
From: Jaya Surya Thotapalli <jayasurya.thotapalli@phonepe.com>
Date: Sun, 5 May 2024 21:59:42 +0530
Subject: [PATCH] Bump up dependencies

---
 app/build.gradle.kts                          |  2 ++
 app/src/main/AndroidManifest.xml              |  3 +--
 build.gradle.kts                              |  6 ++---
 buildSrc/src/main/java/BuildConfig.kt         |  4 ++--
 buildSrc/src/main/java/Dependency.kt          | 24 +++++++++----------
 data/build.gradle.kts                         | 16 +++++++++++--
 data/data.podspec                             | 11 +++++++++
 data/src/androidMain/AndroidManifest.xml      |  2 +-
 gradle.properties                             |  6 +++--
 gradle/wrapper/gradle-wrapper.properties      |  6 ++---
 minesweeper-engine-debug/build.gradle.kts     |  2 ++
 .../src/main/AndroidManifest.xml              |  2 +-
 minesweeper-engine/build.gradle.kts           |  2 ++
 .../src/main/AndroidManifest.xml              |  2 +-
 minesweeper-ui/build.gradle.kts               |  2 ++
 minesweeper-ui/src/main/AndroidManifest.xml   |  2 +-
 ui-difficulty-selection/build.gradle.kts      |  2 ++
 .../src/main/AndroidManifest.xml              |  2 +-
 ui-game/build.gradle.kts                      |  2 ++
 ui-game/src/main/AndroidManifest.xml          |  3 +--
 ui-settings/build.gradle.kts                  |  2 ++
 ui-settings/src/main/AndroidManifest.xml      |  2 +-
 util/build.gradle.kts                         |  2 ++
 util/src/main/AndroidManifest.xml             |  2 +-
 24 files changed, 74 insertions(+), 35 deletions(-)

diff --git a/app/build.gradle.kts b/app/build.gradle.kts
index e03eb65..d2b9ef1 100644
--- a/app/build.gradle.kts
+++ b/app/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.minesweeperjc"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb3ca5c..55b8a7e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.jayasuryat.minesweeperjc">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:name=".MinesweeperApp"
diff --git a/build.gradle.kts b/build.gradle.kts
index 7b0ac1b..d5083ff 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -8,11 +8,11 @@ buildscript {
     }
 
     dependencies {
-        classpath("com.android.tools.build:gradle:7.4.2")
-        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.10")
+        classpath("com.android.tools.build:gradle:8.2.0")
+        classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.23")
         classpath("com.github.ben-manes:gradle-versions-plugin:0.46.0")
         classpath("com.squareup.sqldelight:gradle-plugin:1.5.5")
-        classpath(kotlin("serialization", version = "1.6.10"))
+        classpath(kotlin("serialization", version = "1.9.23"))
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
diff --git a/buildSrc/src/main/java/BuildConfig.kt b/buildSrc/src/main/java/BuildConfig.kt
index 1580bd3..64030f1 100644
--- a/buildSrc/src/main/java/BuildConfig.kt
+++ b/buildSrc/src/main/java/BuildConfig.kt
@@ -2,9 +2,9 @@ import org.gradle.api.JavaVersion
 
 object BuildConfig {
 
-    const val compileSdk: Int = 33
+    const val compileSdk: Int = 34
     const val minSdk: Int = 22
-    const val targetSdk: Int = 33
+    const val targetSdk: Int = 34
 
     val javaVersion = JavaVersion.VERSION_1_8
     const val jvmTarget = "1.8"
diff --git a/buildSrc/src/main/java/Dependency.kt b/buildSrc/src/main/java/Dependency.kt
index 5b5ee8a..b072674 100644
--- a/buildSrc/src/main/java/Dependency.kt
+++ b/buildSrc/src/main/java/Dependency.kt
@@ -26,20 +26,20 @@ object Dependency {
 
     object Compose {
 
-        const val composeCompilerVersion = "1.4.4"
-        private const val composeVersion = "1.4.1"
+        const val composeCompilerVersion = "1.5.13"
+        private const val composeVersion = "1.6.7"
 
         const val ui = "androidx.compose.ui:ui:$composeVersion"
         const val uiUtil = "androidx.compose.ui:ui-util:$composeVersion"
         const val material = "androidx.compose.material:material:$composeVersion"
         const val toolingPreview = "androidx.compose.ui:ui-tooling-preview:$composeVersion"
         const val tooling = "androidx.compose.ui:ui-tooling:$composeVersion"
-        const val activity = "androidx.activity:activity-compose:1.7.0"
-        const val navigation = "androidx.navigation:navigation-compose:2.5.3"
+        const val activity = "androidx.activity:activity-compose:1.9.0"
+        const val navigation = "androidx.navigation:navigation-compose:2.7.7"
 
-        private const val accompanaistVersion = "0.30.1"
+        private const val accompanaistVersion = "0.34.0"
         const val accompanistInsets =
-            "com.google.accompanist:accompanist-insets:$accompanaistVersion"
+            "com.google.accompanist:accompanist-insets:0.30.1"
         const val accompanistPager =
             "com.google.accompanist:accompanist-pager:$accompanaistVersion"
         const val accompanistNavAnimation =
@@ -51,20 +51,20 @@ object Dependency {
         }
     }
 
-    const val coreKtx = "androidx.core:core-ktx:1.9.0"
+    const val coreKtx = "androidx.core:core-ktx:1.13.1"
     const val material = "com.google.android.material:material:1.8.0"
 
-    const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:2.6.1"
+    const val lifecycleRuntime = "androidx.lifecycle:lifecycle-runtime-ktx:2.7.0"
 
     private const val taktVersion = "2.1.1"
     const val takt = "jp.wasabeef:takt:$taktVersion"
     const val taktNoOp = "jp.wasabeef:takt-no-op:$taktVersion"
 
-    const val settings = "com.russhwolf:multiplatform-settings-no-arg:1.0.0"
-    const val kotlinxSerialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.0"
+    const val settings = "com.russhwolf:multiplatform-settings-no-arg:1.1.1"
+    const val kotlinxSerialization = "org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3"
 
-    private const val koinVersion = "3.4.0"
-    private const val koinComposeVersion = "3.4.3"
+    private const val koinVersion = "3.5.6"
+    private const val koinComposeVersion = koinVersion
     const val koinCore = "io.insert-koin:koin-core:$koinVersion"
     const val koinAndroid = "io.insert-koin:koin-android:$koinVersion"
     const val koinCompose = "io.insert-koin:koin-androidx-compose:$koinComposeVersion"
diff --git a/data/build.gradle.kts b/data/build.gradle.kts
index 821eeb9..85eaac8 100644
--- a/data/build.gradle.kts
+++ b/data/build.gradle.kts
@@ -10,7 +10,11 @@ version = "1.0"
 
 kotlin {
 
-    android()
+    android{
+        compilations.all {
+            kotlinOptions.jvmTarget = BuildConfig.jvmTarget
+        }
+    }
 
     val sdkName = System.getenv("SDK_NAME")
     if (sdkName != null && sdkName.startsWith("iphoneos")) {
@@ -51,7 +55,7 @@ kotlin {
                 implementation(Dependency.sqldelightAndroidDriver)
             }
         }
-        val androidTest by getting {
+        val androidUnitTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")
@@ -74,12 +78,20 @@ kotlin {
 }
 
 android {
+
+    namespace = "com.jayasuryat.data"
+
     compileSdk = BuildConfig.compileSdk
     sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml")
     defaultConfig {
         minSdk = BuildConfig.minSdk
         targetSdk = BuildConfig.targetSdk
     }
+
+    compileOptions {
+        sourceCompatibility = BuildConfig.javaVersion
+        targetCompatibility = BuildConfig.javaVersion
+    }
 }
 
 sqldelight {
diff --git a/data/data.podspec b/data/data.podspec
index 0c7c14e..3ce7b3f 100644
--- a/data/data.podspec
+++ b/data/data.podspec
@@ -11,6 +11,17 @@ Pod::Spec.new do |spec|
     spec.ios.deployment_target = '14.1'
                 
                 
+    if !Dir.exist?('build/cocoapods/framework/data.framework') || Dir.empty?('build/cocoapods/framework/data.framework')
+        raise "
+
+        Kotlin framework 'data' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :data:generateDummyFramework
+
+        Alternatively, proper pod installation is performed during Gradle sync in the IDE (if Podfile location is set)"
+    end
+                
     spec.pod_target_xcconfig = {
         'KOTLIN_PROJECT_PATH' => ':data',
         'PRODUCT_MODULE_NAME' => 'data',
diff --git a/data/src/androidMain/AndroidManifest.xml b/data/src/androidMain/AndroidManifest.xml
index 2fed852..568741e 100644
--- a/data/src/androidMain/AndroidManifest.xml
+++ b/data/src/androidMain/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.data" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 90e1117..c2eb747 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -6,7 +6,7 @@
 # http://www.gradle.org/docs/current/userguide/build_environment.html
 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
-org.gradle.jvmargs=-Xmx4g -XX:MaxPermSize=2g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
+org.gradle.jvmargs=-Xmx4g -XX:+HeapDumpOnOutOfMemoryError -Dfile.encoding=UTF-8
 org.gradle.parallel=true
 org.gradle.caching=true
 android.nonTransitiveRClass=true
@@ -19,4 +19,6 @@ android.nonTransitiveRClass=true
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonFinalResIds=false
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 07f2861..87fe79d 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Nov 09 08:42:27 IST 2021
+#Sun May 05 21:35:37 IST 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
diff --git a/minesweeper-engine-debug/build.gradle.kts b/minesweeper-engine-debug/build.gradle.kts
index 730e435..94c94be 100644
--- a/minesweeper-engine-debug/build.gradle.kts
+++ b/minesweeper-engine-debug/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.minesweeperenginedebug"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/minesweeper-engine-debug/src/main/AndroidManifest.xml b/minesweeper-engine-debug/src/main/AndroidManifest.xml
index 43cf7fd..568741e 100644
--- a/minesweeper-engine-debug/src/main/AndroidManifest.xml
+++ b/minesweeper-engine-debug/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.minesweeperenginedebug" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/minesweeper-engine/build.gradle.kts b/minesweeper-engine/build.gradle.kts
index 865a21e..9417af0 100644
--- a/minesweeper-engine/build.gradle.kts
+++ b/minesweeper-engine/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.minesweeperengine"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/minesweeper-engine/src/main/AndroidManifest.xml b/minesweeper-engine/src/main/AndroidManifest.xml
index 4ce03db..568741e 100644
--- a/minesweeper-engine/src/main/AndroidManifest.xml
+++ b/minesweeper-engine/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.minesweeperengine" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/minesweeper-ui/build.gradle.kts b/minesweeper-ui/build.gradle.kts
index 4789b0f..eabdcb6 100644
--- a/minesweeper-ui/build.gradle.kts
+++ b/minesweeper-ui/build.gradle.kts
@@ -6,6 +6,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.minesweeperui"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/minesweeper-ui/src/main/AndroidManifest.xml b/minesweeper-ui/src/main/AndroidManifest.xml
index 7aba7ed..568741e 100644
--- a/minesweeper-ui/src/main/AndroidManifest.xml
+++ b/minesweeper-ui/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.minesweeperui" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/ui-difficulty-selection/build.gradle.kts b/ui-difficulty-selection/build.gradle.kts
index ccbc5d9..0b82d7c 100644
--- a/ui-difficulty-selection/build.gradle.kts
+++ b/ui-difficulty-selection/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.difficultyselection"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/ui-difficulty-selection/src/main/AndroidManifest.xml b/ui-difficulty-selection/src/main/AndroidManifest.xml
index e39c6b7..568741e 100644
--- a/ui-difficulty-selection/src/main/AndroidManifest.xml
+++ b/ui-difficulty-selection/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.difficultyselection" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/ui-game/build.gradle.kts b/ui-game/build.gradle.kts
index 926fff6..79d83f5 100644
--- a/ui-game/build.gradle.kts
+++ b/ui-game/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.uigame"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/ui-game/src/main/AndroidManifest.xml b/ui-game/src/main/AndroidManifest.xml
index b8b6522..77347d2 100644
--- a/ui-game/src/main/AndroidManifest.xml
+++ b/ui-game/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.jayasuryat.uigame">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.VIBRATE" />
 
diff --git a/ui-settings/build.gradle.kts b/ui-settings/build.gradle.kts
index b464a39..408eb7b 100644
--- a/ui-settings/build.gradle.kts
+++ b/ui-settings/build.gradle.kts
@@ -5,6 +5,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.uisettings"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/ui-settings/src/main/AndroidManifest.xml b/ui-settings/src/main/AndroidManifest.xml
index 42758fd..568741e 100644
--- a/ui-settings/src/main/AndroidManifest.xml
+++ b/ui-settings/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.uisettings" />
\ No newline at end of file
+<manifest />
\ No newline at end of file
diff --git a/util/build.gradle.kts b/util/build.gradle.kts
index 17bbb8d..eb5bd6a 100644
--- a/util/build.gradle.kts
+++ b/util/build.gradle.kts
@@ -7,6 +7,8 @@ plugins {
 
 android {
 
+    namespace = "com.jayasuryat.util"
+
     compileSdk = BuildConfig.compileSdk
 
     defaultConfig {
diff --git a/util/src/main/AndroidManifest.xml b/util/src/main/AndroidManifest.xml
index 47aa0f5..568741e 100644
--- a/util/src/main/AndroidManifest.xml
+++ b/util/src/main/AndroidManifest.xml
@@ -1,2 +1,2 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.jayasuryat.util" />
\ No newline at end of file
+<manifest />
\ No newline at end of file