Compose resources migration, Bumping dependencies and Kotlin 2.0.0 (#14)

* Compose resources migration

* Bumping versions

* Fixing Paywall and resources issue

* Bumping app version

* Update ios build action workflow

* Updating ios project

.github/workflows/build_debug_app.yml

@@ -42,7 +42,7 @@ jobs:
         run: ./gradlew assembleDebug
 
       - name: Build iOS Debug app
-        run: xcodebuild -workspace iosApp/iosApp.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 8' build
+        run: xcodebuild -allowProvisioningUpdates -workspace iosApp/iosApp.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 14' build
 
       - name: Upload APK
         uses: actions/upload-artifact@v3

.github/workflows/publish-playstore-appstore.yml

@@ -109,7 +109,7 @@ jobs:
           cp $PP_PATH ~/Library/MobileDevice/Provisioning\ Profiles
       - name: Build iOSApp archive
         run: |
-          xcodebuild -workspace iosApp/iosApp.xcworkspace \
+          xcodebuild -allowProvisioningUpdates -workspace iosApp/iosApp.xcworkspace \
           -scheme iosApp \
           -sdk iphoneos \
           -archivePath $RUNNER_TEMP/iosApp.xcarchive \
@@ -120,10 +120,12 @@ jobs:
       - name: Export iosApp ipa file
         env:
           EXPORT_OPTIONS_PLIST: ${{ secrets.IOS_EXPORT_OPTIONS_BASE64 }}
+          APPSTORE_API_KEY_ID: ${{ secrets.IOS_APPSTORE_API_KEY_ID }}
+          APPSTORE_API_KEY_ISSUER_ID: ${{ secrets.IOS_APPSTORE_API_KEY_ISSUER_ID }}
         run: |
           EXPORT_OPTS_PATH=$RUNNER_TEMP/ExportOptions.plist
           echo -n "$EXPORT_OPTIONS_PLIST" | base64 --decode -o $EXPORT_OPTS_PATH
-          xcodebuild -exportArchive -archivePath $RUNNER_TEMP/iosApp.xcarchive -exportOptionsPlist $EXPORT_OPTS_PATH -exportPath $RUNNER_TEMP/build
+          xcodebuild -allowProvisioningUpdates -exportArchive -archivePath $RUNNER_TEMP/iosApp.xcarchive -exportOptionsPlist $EXPORT_OPTS_PATH -exportPath $RUNNER_TEMP/build -authenticationKeyID $APPSTORE_API_KEY_ID -authenticationKeyIssuerID $APPSTORE_API_KEY_ISSUER_ID
       
 
       - name: Upload app files to Artifact

.gitignore

@@ -14,3 +14,4 @@ iosApp/iosApp.xcodeproj/*
 !iosApp/iosApp.xcodeproj/project.pbxproj
 distribution/android/*
 distribution/ios/*
+.kotlin

androidApp/build.gradle.kts

@@ -7,6 +7,7 @@ plugins {
     alias(libs.plugins.compose)
     alias(libs.plugins.google.services)
     alias(libs.plugins.firebase.crashlytics)
+    alias(libs.plugins.composeCompiler)
 }
 
 kotlin {

androidApp/src/androidMain/AndroidManifest.xml

@@ -36,7 +36,7 @@
             android:name="com.google.firebase.messaging.default_notification_color"
             android:resource="@color/orange" />
 
-        <meta-data android:name="com.google.android.play.billingclient.version" android:value="6.1.0" />
+        <meta-data android:name="com.google.android.play.billingclient.version" android:value="6.2.1" />
     </application>
 
 </manifest>

build.gradle.kts

@@ -6,6 +6,7 @@ plugins {
     alias(libs.plugins.android.application) apply false
     alias(libs.plugins.android.library) apply false
     alias(libs.plugins.compose) apply false
+    alias(libs.plugins.composeCompiler) apply false
     alias(libs.plugins.google.services) apply false
     alias(libs.plugins.firebase.crashlytics) apply false
 }

distribution/whatsnew/whatsnew-en-US

@@ -1,2 +1 @@
-Subscription Premium is added for premium features.
-Fixed crashes when server returns error.
+Updating dependencies

gradle.properties

@@ -5,19 +5,21 @@ org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
 kotlin.code.style=official
 
 #MPP
-kotlin.mpp.stability.nowarn=true
 kotlin.mpp.enableCInteropCommonization=true
 kotlin.mpp.androidSourceSetLayoutVersion=2
 
-#Compose
-#org.jetbrains.compose.experimental.uikit.enabled=true
+#Cache need to be turned off after using kotlin 2.0.0,
+# related issue: https://youtrack.jetbrains.com/issue/KT-68797
+kotlin.native.cacheKind=none
+compose.kotlin.native.manageCacheKind=false
+
 
 #Android
 android.useAndroidX=true
 android.targetSdk=34
 android.compileSdk=34
 android.minSdk=24
-android.versionCode=20
-android.versionName=2.3.2
+android.versionCode=21
+android.versionName=2.3.4
 
 

gradle/libs.versions.toml

@@ -1,27 +1,27 @@
 [versions]
-compose = "1.5.11"
-kotlin = "1.9.21"
-androidGradlePlugin = "8.1.3"
-androidxAvtivityCpmpose = "1.7.2"
-androidxLifecycleRuntimeCpmpose = "2.6.2"
-androidxAppCompat = "1.6.1"
-androidxCore = "1.10.1"
-koin = "3.5.0"
-koinCompose = "1.1.0"
+compose-plugin = "1.6.11"
+kotlin = "2.0.0"
+androidGradlePlugin = "8.1.4"
+androidxAvtivityCpmpose = "1.9.0"
+androidxLifecycleRuntimeCpmpose = "2.8.1"
+androidxAppCompat = "1.7.0"
+androidxCore = "1.13.1"
+koin = "3.5.6"
+koinCompose = "1.1.5"
 multiplatformSettings = "1.0.0"
-voyager = "1.0.0-rc10"
+voyager = "1.1.0-beta02"
 kotlinxSerialization = "1.6.0"
-kotlinxDateTime = "0.4.1"
-ktor = "2.3.5"
+kotlinxDateTime = "0.6.0"
+ktor = "2.3.7"
 logback = "1.2.11"
 napier = "2.6.1"
-firebaseBom="32.4.1"
-googleServices="4.4.0"
-firebaseCrashlytics = "2.9.9"
-kmpNotifier = "0.3.0"
-kmpAuth = "1.1.0"
+firebaseBom="33.1.0"
+googleServices="4.4.2"
+firebaseCrashlytics = "3.0.1"
+kmpNotifier = "1.0.0"
+kmpAuth = "2.0.0"
 coil = "3.0.0-alpha03"
-kmpRevenueCat="0.0.6"
+kmpRevenueCat="1.0.0"
 
 
 
@@ -51,6 +51,7 @@ multiplatformSettings-noargs = { module = "com.russhwolf:multiplatform-settings-
 
 #Navigation Library
 voyager-navigator = { group = "cafe.adriel.voyager", name = "voyager-navigator", version.ref = "voyager" }
+voyager-screenmodel = { group = "cafe.adriel.voyager", name = "voyager-screenmodel", version.ref = "voyager" }
 voyager-tabNavigator = { group = "cafe.adriel.voyager", name = "voyager-tab-navigator", version.ref = "voyager" }
 voyager-transitions = { group = "cafe.adriel.voyager", name = "voyager-transitions", version.ref = "voyager" }
 
@@ -87,7 +88,7 @@ kmprevenuecat-purchases-ui = { group = "io.github.mirzemehdi", name = "kmprevenu
 
 
 [bundles]
-voyager = ["voyager-navigator", "voyager-tabNavigator", "voyager-transitions"]
+voyager = ["voyager-navigator", "voyager-tabNavigator", "voyager-transitions","voyager-screenmodel"]
 koin = ["koin-core", "koin-compose"]
 ktor = ["ktor-client-core", "ktor-client-cio", "ktor-client-logging", "ktor-client-content-negotiation", "ktor-serialization-kotlinx-json"]
 
@@ -99,7 +100,8 @@ android-test = { id = "com.android.test", version.ref = "androidGradlePlugin" }
 kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
 kotlin-multiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" }
 kotlin-serialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" }
-compose = { id = "org.jetbrains.compose", version.ref = "compose" }
+compose = { id = "org.jetbrains.compose", version.ref = "compose-plugin" }
 google-services = { id = "com.google.gms.google-services", version.ref = "googleServices" }
 firebase-crashlytics = { id = "com.google.firebase.crashlytics", version.ref = "firebaseCrashlytics" }
 kotlinNativeCocoapods = { id = "org.jetbrains.kotlin.native.cocoapods", version.ref = "kotlin" }
+composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }

iosApp/FindTravelNow StoreKit.storekit

@@ -22,6 +22,8 @@
   ],
   "settings" : {
     "_failTransactionsEnabled" : false,
+    "_locale" : "en_US",
+    "_storefront" : "USA",
     "_storeKitErrors" : [
       {
         "current" : null,

iosApp/Podfile.lock

@@ -9,8 +9,8 @@ EXTERNAL SOURCES:
     :path: "../shared"
 
 SPEC CHECKSUMS:
-  shared: 45f487984c6fbabf19d6b4eb91ffb5129a2bfc20
+  shared: c36835b8367a333dc9e2eef73565e57688bc6e9b
 
 PODFILE CHECKSUM: 0a20442581fb5fc64112ac1d7a63be54e50e4662
 
-COCOAPODS: 1.14.3
+COCOAPODS: 1.15.2