From cb604ea0ca046d836259f978744bde5c495aa53d Mon Sep 17 00:00:00 2001 From: John O'Reilly Date: Wed, 25 Sep 2024 08:25:19 +0100 Subject: [PATCH 1/2] Koin 4 update --- .../commonMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.kt | 2 +- gradle/libs.versions.toml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.kt b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.kt index 38c9311..140ef89 100644 --- a/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.kt +++ b/composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.kt @@ -31,7 +31,7 @@ fun commonModule(enableNetworkLogs: Boolean = false) = module { single { CountryListViewModel() } single { CountryDetailsViewModel() } single { ClimateTraceRepository(get(), get()) } - loadKoinModules(dataModule()) + includes(dataModule()) } expect fun dataModule(): Module diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 80ff7b8..d7dcc31 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,8 @@ compose-plugin = "1.7.0" composeAdaptiveLayout = "1.0.0" harawata-appdirs = "1.2.2" koalaplot = "0.5.3" -koin = "3.6.0-Beta4" -koin-compose-multiplatform = "1.2.0-Beta4" +koin = "4.0.0" +koin-compose-multiplatform = "4.0.0" kmpNativeCoroutines = "1.0.0-ALPHA-35" kmpObservableViewModel = "1.0.0-BETA-6" kstore = "0.8.0" From 771f92d871d0566c03fd091d2cc809aebac7db06 Mon Sep 17 00:00:00 2001 From: John O'Reilly Date: Fri, 29 Nov 2024 11:35:33 +0000 Subject: [PATCH 2/2] koin 4.0.1-beta --- .github/workflows/ios.yml | 2 +- gradle/libs.versions.toml | 4 +- iosApp/iosApp.xcodeproj/project.pbxproj | 4 +- .../contents.xcworkspacedata | 7 ++ .../xcshareddata/swiftpm/Package.resolved | 15 ++++ .../UserInterfaceState.xcuserstate | Bin 0 -> 42709 bytes .../xcschemes/xcschememanagement.plist | 5 ++ .../xcschemes/iosApp.xcscheme | 79 ++++++++++++++++++ 8 files changed, 111 insertions(+), 5 deletions(-) create mode 100644 iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata create mode 100644 iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved create mode 100644 iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate create mode 100644 iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/xcschemes/xcschememanagement.plist create mode 100644 iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme diff --git a/.github/workflows/ios.yml b/.github/workflows/ios.yml index c239508..18f73af 100644 --- a/.github/workflows/ios.yml +++ b/.github/workflows/ios.yml @@ -19,7 +19,7 @@ jobs: java-version: 17 - name: Build iOS app - run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 14' build + run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 15' build diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d7dcc31..8a25781 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -14,8 +14,8 @@ compose-plugin = "1.7.0" composeAdaptiveLayout = "1.0.0" harawata-appdirs = "1.2.2" koalaplot = "0.5.3" -koin = "4.0.0" -koin-compose-multiplatform = "4.0.0" +koin = "4.0.1-Beta1" +koin-compose-multiplatform = "4.0.1-Beta1" kmpNativeCoroutines = "1.0.0-ALPHA-35" kmpObservableViewModel = "1.0.0-BETA-6" kstore = "0.8.0" diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj index 8f6c01d..1eeeee1 100644 --- a/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -325,9 +325,9 @@ buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; CODE_SIGN_IDENTITY = "Apple Development"; - CODE_SIGN_STYLE = Automatic; + CODE_SIGN_STYLE = Manual; DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; - DEVELOPMENT_TEAM = NT77748GS8; + DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; FRAMEWORK_SEARCH_PATHS = ( "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..919434a --- /dev/null +++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved new file mode 100644 index 0000000..3c5a788 --- /dev/null +++ b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved @@ -0,0 +1,15 @@ +{ + "originHash" : "88d7673b251b3cbb9c40069df64b8e0aa1c4062dac38b066e5314b1847241136", + "pins" : [ + { + "identity" : "kmp-observableviewmodel", + "kind" : "remoteSourceControl", + "location" : "https://github.com/rickclephas/KMP-ObservableViewModel.git", + "state" : { + "revision" : "f18dcd23199915f7134db9ef5b0d4425bf4edb91", + "version" : "1.0.0-BETA-1" + } + } + ], + "version" : 3 +} diff --git a/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate b/iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate new file mode 100644 index 0000000000000000000000000000000000000000..e1d1bdf964351b8a57f1310fee1b1d9841a933d9 GIT binary patch literal 42709 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%0AqUq@a8U1y8^V< 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 + + + + diff --git a/iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme b/iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme new file mode 100644 index 0000000..f885bc6 --- /dev/null +++ b/iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +