Test new JetBrains SPM integration.

pablichjenkov · May 29, 2024 · bde6701 · bde6701
1 parent ad92a0e
commit bde6701
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 7 deletions.
diff --git a/auth-firebase/build.gradle.kts b/auth-firebase/build.gradle.kts
@@ -154,3 +154,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
+
+compose {
+    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.9.23"))
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24")
+    //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24-spm")
+}
diff --git a/auth-supabase/build.gradle.kts b/auth-supabase/build.gradle.kts
@@ -62,3 +62,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
+
+compose {
+    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.9.23"))
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24")
+    //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24-spm")
+}
diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts
@@ -252,6 +252,9 @@ compose {
     experimental {
         web.application {}
     }
+    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.9.23"))
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24")
+    //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24-spm")
 }
 
 /*compose.desktop {

diff --git a/flavor-theme-a/build.gradle.kts b/flavor-theme-a/build.gradle.kts
@@ -62,3 +62,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
+
+compose {
+    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.9.23"))
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24")
+    //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24-spm")
+}
diff --git a/flavor-theme-b/build.gradle.kts b/flavor-theme-b/build.gradle.kts
@@ -62,3 +62,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
+
+compose {
+    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.9.23"))
+    //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24-spm")
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24")
+}
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -7,10 +7,10 @@ macaoAmadeusApi = "0.3.4"
 macaoComponentToolkit = "0.6.10-rc02"
 macaoAuthFirebase = "0.0.1-dev"
 koinCore = "3.6.0-wasm-alpha2"
-kotlin = "1.9.23"
+kotlin = "1.9.24-spm"
 agp = "8.1.4"
 composeAndroidCompiler = "1.6.7"
-composePlugin = "1.6.10-rc01"
+composePlugin = "1.6.10-rc03"
 androidxActivityCompose = "1.9.0"
 kamelImage = "0.9.4"
 kotlinxCoroutines = "1.8.0"

diff --git a/iOSDemoApp/iOSDemoApp/MacaoDemoApp.swift b/iOSDemoApp/iOSDemoApp/MacaoDemoApp.swift
@@ -9,6 +9,13 @@ struct MacaoDemoApp: App {
     let accountPlugin: AccountPlugin
     let iosBridge: IosBridge
 
+    let iob = IosBridge(
+        accountPlugin: FirebaseAccountPlugin(
+            firebaseAuthKmpWrapper: FirebaseAuthKmpWrapperImpl()
+        ),
+        name2: Int32(0)
+    )
+
     // register app delegate for Firebase setup
     // @UIApplicationDelegateAdaptor(MacaoDemoAppDelegate.self) var delegate
 

diff --git a/iOSDemoApp/iOSDemoAppPackage/Package.swift b/iOSDemoApp/iOSDemoAppPackage/Package.swift
@@ -18,14 +18,15 @@ let package = Package(
         .package(url: "https://github.com/pablichjenkov/firebase-kmp.git", branch: "composeApp"),
     ],
     targets: [
-        .binaryTarget(
-            name: "composeApp",
-            path: "../../composeApp/build/XCFrameworks/debug/composeApp.xcframework"
-        ),
+// It wont be needed after JetBrains releases SPM BuildPhase task integration
+//        .binaryTarget(
+//            name: "composeApp",
+//            path: "../../composeApp/build/XCFrameworks/debug/composeApp.xcframework"
+//        ),
         .target(
             name: "iOSDemoAppPackage",
             dependencies: [
-                .byName(name: "composeApp"),
+                //.byName(name: "composeApp"), // It wont be needed after JetBrains releases SPM BuildPhase task integration
                 .product(
                     name: "FirebaseAuth",
                     package: "firebase-ios-sdk"

diff --git a/macao-sdk-koin/build.gradle.kts b/macao-sdk-koin/build.gradle.kts
@@ -162,3 +162,9 @@ android {
         targetCompatibility = JavaVersion.VERSION_17
     }
 }
+
+compose {
+    kotlinCompilerPlugin.set(dependencies.compiler.forKotlin("1.9.23"))
+    kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24")
+    //kotlinCompilerPluginArgs.add("suppressKotlinVersionCompatibilityCheck=1.9.24-spm")
+}
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -14,6 +14,7 @@ pluginManagement {
         gradlePluginPortal()
         mavenCentral()
         maven("https://maven.pkg.jetbrains.space/public/p/compose/dev")
+        maven("https://packages.jetbrains.team/maven/p/mpp/dev")
         mavenLocal()
     }
 }
@@ -24,6 +25,7 @@ dependencyResolutionManagement {
         mavenCentral()
         maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev")
         maven(url = "https://maven.pkg.jetbrains.space/kotlin/p/wasm/experimental")
+        maven("https://packages.jetbrains.team/maven/p/mpp/dev")
         mavenLocal()
     }
 }