Skip to content

Commit d45b245

Browse files
joreillyjoreilly
committed
dependency updates
1 parent 90d7c73 commit d45b245

File tree

7 files changed

+63
-48
lines changed

7 files changed

+63
-48
lines changed

Diff for: ‎.github/workflows/android.yml

-3
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,6 @@ jobs:
1818
run: ./gradlew assembleDebug
1919

2020

21-
- name: Build iOS shared code
22-
run: ./gradlew :shared:compileKotlinIosArm64
23-
2421
- name: Tests
2522
run: ./gradlew :shared:jvmTest
2623

Diff for: ‎.github/workflows/ios.yml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: iOS CI
2+
3+
on: pull_request
4+
5+
jobs:
6+
build:
7+
8+
runs-on: ubuntu-latest
9+
10+
steps:
11+
- uses: actions/checkout@v4
12+
- name: set up JDK 17
13+
uses: actions/setup-java@v4
14+
with:
15+
distribution: 'zulu'
16+
java-version: 17
17+
18+
- name: Build iOS shared code
19+
run: ./gradlew :shared:compileKotlinIosArm64
20+

Diff for: ‎gradle.properties

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@ kotlin.code.style=official
33
xcodeproj=./iosApp
44

55
kotlin.mpp.stability.nowarn=true
6+
kotlin.native.toolchain.enabled=false
7+
68
org.gradle.jvmargs=-Xmx2048M -Dkotlin.daemon.jvm.options\="-Xmx2048M"
79
kotlin.mpp.androidSourceSetLayoutVersion=2
810
android.useAndroidX=true

Diff for: ‎gradle/libs.versions.toml

+10-9
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
[versions]
2-
kotlin = "2.0.21"
3-
ksp = "2.0.21-1.0.25"
2+
kotlin = "2.1.0"
3+
ksp = "2.1.0-1.0.29"
44
kotlinx-coroutines = "1.9.0"
55

6-
androidGradlePlugin = "8.7.1"
6+
androidGradlePlugin = "8.7.3"
77
koin = "4.0.0"
88
koinComposeMultiplatform = "4.0.0"
9-
apollo = "4.0.1"
10-
kmpNativeCoroutines = "1.0.0-ALPHA-37"
9+
apollo = "4.1.0"
10+
apolloMockServer = "0.1.0"
11+
kmpNativeCoroutines = "1.0.0-ALPHA-38"
1112

1213
androidxActivity = "1.9.3"
13-
androidxComposeBom = "2024.10.00"
14+
androidxComposeBom = "2024.12.01"
1415
androidx-navigation = "2.8.0-alpha08"
15-
androidx-lifecycle = "2.8.3"
16+
androidx-lifecycle = "2.8.4"
1617
accompanist = "0.30.1"
1718
horologist = "0.6.20"
1819
wearCompose = "1.4.0"
19-
composeMultiplatform = "1.7.0"
20+
composeMultiplatform = "1.7.3"
2021
composeWindowSize = "0.5.0"
2122

2223
junit = "4.13.2"
@@ -67,7 +68,7 @@ koin-test = { module = "io.insert-koin:koin-test", version.ref = "koin" }
6768
apollo-runtime = { group = "com.apollographql.apollo", name = "apollo-runtime", version.ref = "apollo" }
6869
apollo-normalized-cache = { group = "com.apollographql.apollo", name = "apollo-normalized-cache", version.ref = "apollo" }
6970
apollo-normalized-cache-sqlite = { group = "com.apollographql.apollo", name = "apollo-normalized-cache-sqlite", version.ref = "apollo" }
70-
apollo-mockserver = { group = "com.apollographql.apollo", name = "apollo-mockserver", version.ref = "apollo" }
71+
apollo-mockserver = { group = "com.apollographql.mockserver", name = "apollo-mockserver", version.ref = "apolloMockServer" }
7172
apollo-testing-support = { group = "com.apollographql.apollo", name = "apollo-testing-support", version.ref = "apollo" }
7273

7374
junit = { module = "junit:junit", version.ref = "junit" }

Diff for: ‎iosApp/iosApp.xcodeproj/project.pbxproj

+8-16
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,7 @@
99
/* Begin PBXBuildFile section */
1010
058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; };
1111
058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; };
12-
1A431ABC2A2A7C1400FC6ED9 /* KMPNativeCoroutinesAsync in Frameworks */ = {isa = PBXBuildFile; productRef = 1A431ABB2A2A7C1400FC6ED9 /* KMPNativeCoroutinesAsync */; };
13-
1A431ABE2A2A7C1400FC6ED9 /* KMPNativeCoroutinesCore in Frameworks */ = {isa = PBXBuildFile; productRef = 1A431ABD2A2A7C1400FC6ED9 /* KMPNativeCoroutinesCore */; };
12+
1A5F2A772D174F8400F8ADD5 /* KMPNativeCoroutinesAsync in Frameworks */ = {isa = PBXBuildFile; productRef = 1A5F2A762D174F8400F8ADD5 /* KMPNativeCoroutinesAsync */; };
1413
1AC5B19D2764A3C100A5A7C1 /* StarWarsViewModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AC5B19B2764A3C100A5A7C1 /* StarWarsViewModel.swift */; };
1514
1AC5B19E2764A3C100A5A7C1 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AC5B19C2764A3C100A5A7C1 /* ContentView.swift */; };
1615
1AD3669927920DCA005A5CDA /* IosAppTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1AD3669827920DCA005A5CDA /* IosAppTests.swift */; };
@@ -64,8 +63,7 @@
6463
isa = PBXFrameworksBuildPhase;
6564
buildActionMask = 2147483647;
6665
files = (
67-
1A431ABE2A2A7C1400FC6ED9 /* KMPNativeCoroutinesCore in Frameworks */,
68-
1A431ABC2A2A7C1400FC6ED9 /* KMPNativeCoroutinesAsync in Frameworks */,
66+
1A5F2A772D174F8400F8ADD5 /* KMPNativeCoroutinesAsync in Frameworks */,
6967
);
7068
runOnlyForDeploymentPostprocessing = 0;
7169
};
@@ -167,8 +165,7 @@
167165
);
168166
name = iosApp;
169167
packageProductDependencies = (
170-
1A431ABB2A2A7C1400FC6ED9 /* KMPNativeCoroutinesAsync */,
171-
1A431ABD2A2A7C1400FC6ED9 /* KMPNativeCoroutinesCore */,
168+
1A5F2A762D174F8400F8ADD5 /* KMPNativeCoroutinesAsync */,
172169
);
173170
productName = iosApp;
174171
productReference = 7555FF7B242A565900829871 /* iosApp.app */;
@@ -203,7 +200,7 @@
203200
);
204201
mainGroup = 7555FF72242A565900829871;
205202
packageReferences = (
206-
1A431ABA2A2A7C1400FC6ED9 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */,
203+
1A5F2A752D174F8400F8ADD5 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */,
207204
);
208205
productRefGroup = 7555FF7C242A565900829871 /* Products */;
209206
projectDirPath = "";
@@ -561,27 +558,22 @@
561558
/* End XCConfigurationList section */
562559

563560
/* Begin XCRemoteSwiftPackageReference section */
564-
1A431ABA2A2A7C1400FC6ED9 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */ = {
561+
1A5F2A752D174F8400F8ADD5 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */ = {
565562
isa = XCRemoteSwiftPackageReference;
566563
repositoryURL = "https://github.com/rickclephas/KMP-NativeCoroutines.git";
567564
requirement = {
568565
kind = exactVersion;
569-
version = "1.0.0-ALPHA-30";
566+
version = "1.0.0-ALPHA-38";
570567
};
571568
};
572569
/* End XCRemoteSwiftPackageReference section */
573570

574571
/* Begin XCSwiftPackageProductDependency section */
575-
1A431ABB2A2A7C1400FC6ED9 /* KMPNativeCoroutinesAsync */ = {
572+
1A5F2A762D174F8400F8ADD5 /* KMPNativeCoroutinesAsync */ = {
576573
isa = XCSwiftPackageProductDependency;
577-
package = 1A431ABA2A2A7C1400FC6ED9 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */;
574+
package = 1A5F2A752D174F8400F8ADD5 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */;
578575
productName = KMPNativeCoroutinesAsync;
579576
};
580-
1A431ABD2A2A7C1400FC6ED9 /* KMPNativeCoroutinesCore */ = {
581-
isa = XCSwiftPackageProductDependency;
582-
package = 1A431ABA2A2A7C1400FC6ED9 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */;
583-
productName = KMPNativeCoroutinesCore;
584-
};
585577
/* End XCSwiftPackageProductDependency section */
586578
};
587579
rootObject = 7555FF73242A565900829871 /* Project object */;

Diff for: ‎iosApp/iosApp.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

+4-4
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
"kind" : "remoteSourceControl",
77
"location" : "https://github.com/rickclephas/KMP-NativeCoroutines.git",
88
"state" : {
9-
"revision" : "caf590ab2d260be1a9810c64cbcd9ed896330167",
10-
"version" : "1.0.0-ALPHA-30"
9+
"revision" : "a92a55c7054d806cba28bdaf2198e59d1f18df5e",
10+
"version" : "1.0.0-ALPHA-38"
1111
}
1212
},
1313
{
1414
"identity" : "rxswift",
1515
"kind" : "remoteSourceControl",
1616
"location" : "https://github.com/ReactiveX/RxSwift.git",
1717
"state" : {
18-
"revision" : "9dcaa4b333db437b0fbfaf453fad29069044a8b4",
19-
"version" : "6.6.0"
18+
"revision" : "c7c7d2cf50a3211fe2843f76869c698e4e417930",
19+
"version" : "6.8.0"
2020
}
2121
}
2222
],

Diff for: ‎shared/src/commonTest/kotlin/dev/johnoreilly/starwars/shared/StarWarsRepositoryTest.kt

+19-16
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,12 @@ import com.apollographql.apollo.annotations.ApolloExperimental
55
import com.apollographql.apollo.api.toResponseJson
66
import com.apollographql.apollo.cache.normalized.api.MemoryCacheFactory
77
import com.apollographql.apollo.cache.normalized.normalizedCache
8-
import com.apollographql.apollo.mockserver.MockResponse
9-
import com.apollographql.apollo.mockserver.MockServer
8+
import com.apollographql.mockserver.MockServer
9+
import com.apollographql.mockserver.MockResponse
1010
import dev.johnoreilly.starwars.shared.di.commonModule
1111
import kotlinx.coroutines.flow.first
1212
import kotlinx.coroutines.test.runTest
13+
import okio.use
1314
import org.koin.core.context.startKoin
1415
import org.koin.dsl.module
1516
import org.koin.test.KoinTest
@@ -23,7 +24,6 @@ import kotlin.test.assertEquals
2324
class StarWarsRepositoryTest: KoinTest {
2425
private val repo : StarWarsRepository by inject()
2526

26-
private val mockServer = MockServer()
2727
private lateinit var mockServerUrl: String
2828

2929
@BeforeTest
@@ -39,21 +39,24 @@ class StarWarsRepositoryTest: KoinTest {
3939

4040
@Test
4141
fun testStarWarsRepository() = runTest {
42-
mockServerUrl = mockServer.url()
42+
MockServer().use { mockServer ->
43+
mockServerUrl = mockServer.url()
4344

44-
mockServer.enqueue(MockResponse.Builder().body(getAllPeopleMockResponse.toResponseJson()).build())
45-
val people = repo.people.first()
46-
assertEquals(2, people.size)
47-
assertEquals("Person 1", people[0].name)
48-
assertEquals("Home World 1", people[0].homeworld.name)
49-
println(people)
45+
mockServer.enqueue(MockResponse.Builder().body(getAllPeopleMockResponse.toResponseJson()).build())
46+
val people = repo.people.first()
47+
assertEquals(2, people.size)
48+
assertEquals("Person 1", people[0].name)
49+
assertEquals("Home World 1", people[0].homeworld.name)
50+
println(people)
51+
52+
mockServer.enqueue(MockResponse.Builder().body(getAllFilmsMockResponse.toResponseJson()).build())
53+
val films = repo.films.first()
54+
assertEquals(2, films.size)
55+
assertEquals("Film 1", films[0].title)
56+
assertEquals("Director 1", films[0].director)
57+
println(films)
58+
}
5059

51-
mockServer.enqueue(MockResponse.Builder().body(getAllFilmsMockResponse.toResponseJson()).build())
52-
val films = repo.films.first()
53-
assertEquals(2, films.size)
54-
assertEquals("Film 1", films[0].title)
55-
assertEquals("Director 1", films[0].director)
56-
println(films)
5760
}
5861

5962
private fun createMockApolloClient(url: String): ApolloClient {

0 commit comments

Comments
 (0)