From bde6701c9b7cfb9643ced3e4fff1651c1370a9b1 Mon Sep 17 00:00:00 2001 From: Pablo Valdes Date: Fri, 17 May 2024 19:08:24 -0400 Subject: [PATCH] Test new JetBrains SPM integration. --- auth-firebase/build.gradle.kts | 6 ++++++ auth-supabase/build.gradle.kts | 6 ++++++ composeApp/build.gradle.kts | 3 +++ flavor-theme-a/build.gradle.kts | 6 ++++++ flavor-theme-b/build.gradle.kts | 6 ++++++ gradle/libs.versions.toml | 4 ++-- iOSDemoApp/iOSDemoApp/MacaoDemoApp.swift | 7 +++++++ iOSDemoApp/iOSDemoAppPackage/Package.swift | 11 ++++++----- macao-sdk-koin/build.gradle.kts | 6 ++++++ settings.gradle.kts | 2 ++ 10 files changed, 50 insertions(+), 7 deletions(-) diff --git a/auth-firebase/build.gradle.kts b/auth-firebase/build.gradle.kts index e276c7e..f2760a4 100644 --- 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") +} \ No newline at end of file diff --git a/auth-supabase/build.gradle.kts b/auth-supabase/build.gradle.kts index cad186f..8a9522f 100644 --- 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") +} \ No newline at end of file diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts index ad8c13c..2905a53 100755 --- 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 index c8083fc..bf5e61d 100644 --- 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") +} \ No newline at end of file diff --git a/flavor-theme-b/build.gradle.kts b/flavor-theme-b/build.gradle.kts index e50c99d..b985abf 100644 --- 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") +} \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index f8f512d..a6395e3 100644 --- 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 index 191a216..ab579d7 100644 --- 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 index 9e4226d..fc92fd1 100644 --- 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 index 5f39100..e454a28 100644 --- 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") +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts index 014886c..6e0d37c 100644 --- 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() } }