Upgrade Kotlin + Compose Plugin + fix iOS configs

bumble-tech · Jan 22, 2024 · 0b30929 · 0b30929
1 parent 3a27247
commit 0b30929
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 30 deletions.
diff --git a/demos/appyx-interactions/ios/build.gradle.kts b/demos/appyx-interactions/ios/build.gradle.kts
@@ -46,13 +46,6 @@ kotlin {
     }
 }
 
-compose.experimental {
-    uikit.application {
-        projectName = "Appyx"
-        bundleIdPrefix = "com.bumble.appyx"
-    }
-}
-
 dependencies {
     add("kspIosArm64", project(":ksp:appyx-processor"))
     add("kspIosX64", project(":ksp:appyx-processor"))

diff --git a/demos/appyx-interactions/ios/ios.podspec b/demos/appyx-interactions/ios/ios.podspec
@@ -11,6 +11,17 @@ Pod::Spec.new do |spec|
     spec.ios.deployment_target = '16.4'
 
 
+    if !Dir.exist?('build/cocoapods/framework/ios.framework') || Dir.empty?('build/cocoapods/framework/ios.framework')
+        raise "
+
+        Kotlin framework 'ios' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :demos:appyx-interactions:ios: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' => ':demos:appyx-interactions:ios',
         'PRODUCT_MODULE_NAME' => 'ios',

diff --git a/demos/appyx-interactions/iosApp/Configuration/Config.xcconfig b/demos/appyx-interactions/iosApp/Configuration/Config.xcconfig
@@ -1,3 +1,3 @@
 TEAM_ID=
-BUNDLE_ID=com.bumble.appyx.Appyx
-APP_NAME=Appyx
+BUNDLE_ID=com.bumble.appyx.interactions
+APP_NAME=Appyx Interactions
diff --git a/demos/appyx-navigation/ios/build.gradle.kts b/demos/appyx-navigation/ios/build.gradle.kts
@@ -45,13 +45,6 @@ kotlin {
     }
 }
 
-compose.experimental {
-    uikit.application {
-        projectName = "Appyx"
-        bundleIdPrefix = "com.bumble.appyx"
-    }
-}
-
 tasks.register<Copy>("copyResources") {
     // Dirs containing files we want to copy
     from("../common/src/commonMain/resources")

diff --git a/demos/appyx-navigation/ios/ios.podspec b/demos/appyx-navigation/ios/ios.podspec
@@ -11,6 +11,17 @@ Pod::Spec.new do |spec|
     spec.ios.deployment_target = '17.0'
 
 
+    if !Dir.exist?('build/cocoapods/framework/ios.framework') || Dir.empty?('build/cocoapods/framework/ios.framework')
+        raise "
+
+        Kotlin framework 'ios' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :demos:appyx-navigation:ios: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' => ':demos:appyx-navigation:ios',
         'PRODUCT_MODULE_NAME' => 'ios',

diff --git a/demos/appyx-navigation/iosApp/Configuration/Config.xcconfig b/demos/appyx-navigation/iosApp/Configuration/Config.xcconfig
@@ -1,3 +1,3 @@
 TEAM_ID=
-BUNDLE_ID=com.bumble.appyx.Appyx
-APP_NAME=Appyx
+BUNDLE_ID=com.bumble.appyx.navigation
+APP_NAME=Appyx Navigation
diff --git a/demos/sandbox-appyx-navigation/ios/build.gradle.kts b/demos/sandbox-appyx-navigation/ios/build.gradle.kts
@@ -43,13 +43,6 @@ kotlin {
     }
 }
 
-compose.experimental {
-    uikit.application {
-        projectName = "Appyx"
-        bundleIdPrefix = "com.bumble.appyx"
-    }
-}
-
 dependencies {
     add("kspIosArm64", project(":ksp:appyx-processor"))
     add("kspIosX64", project(":ksp:appyx-processor"))

diff --git a/demos/sandbox-appyx-navigation/ios/ios.podspec b/demos/sandbox-appyx-navigation/ios/ios.podspec
@@ -11,6 +11,17 @@ Pod::Spec.new do |spec|
     spec.ios.deployment_target = '16.4'
 
 
+    if !Dir.exist?('build/cocoapods/framework/ios.framework') || Dir.empty?('build/cocoapods/framework/ios.framework')
+        raise "
+
+        Kotlin framework 'ios' doesn't exist yet, so a proper Xcode project can't be generated.
+        'pod install' should be executed after running ':generateDummyFramework' Gradle task:
+
+            ./gradlew :demos:sandbox-appyx-navigation:ios: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' => ':demos:sandbox-appyx-navigation:ios',
         'PRODUCT_MODULE_NAME' => 'ios',

diff --git a/demos/sandbox-appyx-navigation/iosApp/Configuration/Config.xcconfig b/demos/sandbox-appyx-navigation/iosApp/Configuration/Config.xcconfig
@@ -1,3 +1,3 @@
 TEAM_ID=
-BUNDLE_ID=com.bumble.appyx.Appyx
-APP_NAME=Appyx
+BUNDLE_ID=com.bumble.appyx.sandbox
+APP_NAME=Appyx Sandbox
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -9,16 +9,16 @@ androidTargetSdk = "32"
 androidx-lifecycle = "2.6.1"
 androidx-navigation-compose = "2.5.1"
 coil = "2.2.1"
-composePlugin = "1.5.3"
+composePlugin = "1.5.10"
 composeBom = "2023.10.01"
 composeCompiler = "1.5.3"
 coroutines = "1.6.4"
 dependencyAnalysis = "1.13.1"
 detekt = "1.21.0"
 junit5 = "5.8.2"
 jvmTarget = "11"
-kotlin = "1.9.10"
-ksp = "1.9.10-1.0.13"
+kotlin = "1.9.20"
+ksp = "1.9.20-1.0.14"
 mvicore = "1.2.6"
 ribs = "0.39.0"
 serialization-json = "1.5.0"