Skip to content

Commit 4bc3e8c

Browse files
joreillyjoreilly
authored
Merge pull request #122 from joreilly/koin_4
koin 4
2 parents 4326251 + 771f92d commit 4bc3e8c

File tree

9 files changed

+112
-6
lines changed

9 files changed

+112
-6
lines changed

‎.github/workflows/ios.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ jobs:
1919
java-version: 17
2020

2121
- name: Build iOS app
22-
run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 14' build
22+
run: xcodebuild -allowProvisioningUpdates -allowProvisioningUpdates -workspace iosApp/iosApp.xcodeproj/project.xcworkspace -configuration Debug -scheme iosApp -sdk iphoneos -destination name='iPhone 15' build
2323

2424

2525

‎composeApp/src/commonMain/kotlin/dev/johnoreilly/climatetrace/di/Koin.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ fun commonModule(enableNetworkLogs: Boolean = false) = module {
3131
single { CountryListViewModel() }
3232
single { CountryDetailsViewModel() }
3333
single { ClimateTraceRepository(get(), get()) }
34-
loadKoinModules(dataModule())
34+
includes(dataModule())
3535
}
3636

3737
expect fun dataModule(): Module

‎gradle/libs.versions.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ compose-plugin = "1.7.0"
1414
composeAdaptiveLayout = "1.0.0"
1515
harawata-appdirs = "1.2.2"
1616
koalaplot = "0.5.3"
17-
koin = "3.6.0-Beta4"
18-
koin-compose-multiplatform = "1.2.0-Beta4"
17+
koin = "4.0.1-Beta1"
18+
koin-compose-multiplatform = "4.0.1-Beta1"
1919
kmpNativeCoroutines = "1.0.0-ALPHA-35"
2020
kmpObservableViewModel = "1.0.0-BETA-6"
2121
kstore = "0.8.0"

‎iosApp/iosApp.xcodeproj/project.pbxproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -325,9 +325,9 @@
325325
buildSettings = {
326326
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
327327
CODE_SIGN_IDENTITY = "Apple Development";
328-
CODE_SIGN_STYLE = Automatic;
328+
CODE_SIGN_STYLE = Manual;
329329
DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\"";
330-
DEVELOPMENT_TEAM = NT77748GS8;
330+
DEVELOPMENT_TEAM = "";
331331
ENABLE_PREVIEWS = YES;
332332
FRAMEWORK_SEARCH_PATHS = (
333333
"$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)",

‎iosApp/iosApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+7
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
{
2+
"originHash" : "88d7673b251b3cbb9c40069df64b8e0aa1c4062dac38b066e5314b1847241136",
3+
"pins" : [
4+
{
5+
"identity" : "kmp-observableviewmodel",
6+
"kind" : "remoteSourceControl",
7+
"location" : "https://github.com/rickclephas/KMP-ObservableViewModel.git",
8+
"state" : {
9+
"revision" : "f18dcd23199915f7134db9ef5b0d4425bf4edb91",
10+
"version" : "1.0.0-BETA-1"
11+
}
12+
}
13+
],
14+
"version" : 3
15+
}

‎iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/UserInterfaceState.xcuserstate

41.7 KB
Binary file not shown.

‎iosApp/iosApp.xcodeproj/project.xcworkspace/xcuserdata/joreilly.xcuserdatad/xcschemes/xcschememanagement.plist

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
3+
<plist version="1.0">
4+
<dict />
5+
</plist>

‎iosApp/iosApp.xcodeproj/xcuserdata/joreilly.xcuserdatad/xcschemes/iosApp.xcscheme

+79
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<Scheme
3+
version = "1.7">
4+
<BuildAction
5+
parallelizeBuildables = "YES"
6+
buildImplicitDependencies = "YES">
7+
<BuildActionEntries>
8+
<BuildActionEntry
9+
buildForTesting = "YES"
10+
buildForRunning = "YES"
11+
buildForProfiling = "YES"
12+
buildForArchiving = "YES"
13+
buildForAnalyzing = "YES">
14+
<BuildableReference
15+
BuildableIdentifier = "primary"
16+
BlueprintIdentifier = "7555FF7A242A565900829871"
17+
BuildableName = "ClimateTraceKMP.app"
18+
BlueprintName = "iosApp"
19+
ReferencedContainer = "container:iosApp.xcodeproj">
20+
</BuildableReference>
21+
</BuildActionEntry>
22+
</BuildActionEntries>
23+
</BuildAction>
24+
<TestAction
25+
buildConfiguration = "Debug"
26+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
27+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
28+
shouldUseLaunchSchemeArgsEnv = "YES"
29+
shouldAutocreateTestPlan = "YES">
30+
<Testables>
31+
<TestableReference
32+
skipped = "NO"
33+
parallelizable = "YES">
34+
<BuildableReference
35+
BuildableIdentifier = "primary"
36+
BlueprintIdentifier = "1AB84D8E2CA0ABED002A845D"
37+
BuildableName = "ClimateTraceKMPUITests.xctest"
38+
BlueprintName = "ClimateTraceKMPUITests"
39+
ReferencedContainer = "container:iosApp.xcodeproj">
40+
</BuildableReference>
41+
</TestableReference>
42+
</Testables>
43+
</TestAction>
44+
<LaunchAction
45+
buildConfiguration = "Debug"
46+
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
47+
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
48+
launchStyle = "0"
49+
useCustomWorkingDirectory = "NO"
50+
ignoresPersistentStateOnLaunch = "NO"
51+
debugDocumentVersioning = "YES"
52+
debugServiceExtension = "internal"
53+
allowLocationSimulation = "YES">
54+
<BuildableProductRunnable
55+
runnableDebuggingMode = "0">
56+
<BuildableReference
57+
BuildableIdentifier = "primary"
58+
BlueprintIdentifier = "7555FF7A242A565900829871"
59+
BuildableName = "ClimateTraceKMP.app"
60+
BlueprintName = "iosApp"
61+
ReferencedContainer = "container:iosApp.xcodeproj">
62+
</BuildableReference>
63+
</BuildableProductRunnable>
64+
</LaunchAction>
65+
<ProfileAction
66+
buildConfiguration = "Release"
67+
shouldUseLaunchSchemeArgsEnv = "YES"
68+
savedToolIdentifier = ""
69+
useCustomWorkingDirectory = "NO"
70+
debugDocumentVersioning = "YES">
71+
</ProfileAction>
72+
<AnalyzeAction
73+
buildConfiguration = "Debug">
74+
</AnalyzeAction>
75+
<ArchiveAction
76+
buildConfiguration = "Release"
77+
revealArchiveInOrganizer = "YES">
78+
</ArchiveAction>
79+
</Scheme>

0 commit comments

Comments
 (0)