From 3effe933e138b15f1c31d2848f7df8c413ba91f9 Mon Sep 17 00:00:00 2001 From: Gijs van Veen Date: Fri, 15 Nov 2024 13:51:24 +0100 Subject: [PATCH 1/3] Upgrades to latest versions --- example/ios/Demo.xcodeproj/project.pbxproj | 4 +++ gradle/libs.versions.toml | 29 +++++++++++----------- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj index bc23ceb5f..e40a05027 100644 --- a/example/ios/Demo.xcodeproj/project.pbxproj +++ b/example/ios/Demo.xcodeproj/project.pbxproj @@ -90,6 +90,7 @@ C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */; }; C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095989173871C8CDA70C49E1 /* LazyView.generated.swift */; }; C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C9189D92DAF37F9815ECFDC /* NavigationBarColor.generated.swift */; }; + D0F06CF9B138426F812F3B0B /* ShapeView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9730959B8EF5B66133F731D2 /* ShapeView.generated.swift */; }; D174F54A364898AC7E0962FC /* KalugaBackgroundStyle+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7CF72582307421E9939C863E /* KalugaBackgroundStyle+SwiftUI.generated.swift */; }; D17DC9D74F0BD77D12813366 /* Observable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 6681B8FDABE90D9625CA407A /* Observable.generated.swift */; }; D976FB8DC34A35578A995B2E /* KalugaButton+SwiftUI.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 5304E64813F87A2C71BD40C2 /* KalugaButton+SwiftUI.generated.swift */; }; @@ -215,6 +216,7 @@ 89DAFF461D97215C4B63A0A1 /* PlatformMappers.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformMappers.generated.swift; sourceTree = ""; }; 93070CB7E1723F904DBEDD26 /* DefaultValues.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = DefaultValues.generated.swift; sourceTree = ""; }; 944D74BABB71F3B76E746EC8 /* TintedImage+Image.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "TintedImage+Image.generated.swift"; sourceTree = ""; }; + 9730959B8EF5B66133F731D2 /* ShapeView.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; lastKnownFileType = sourcecode.swift; name = ShapeView.generated.swift; path = ShapeView.generated.swift; sourceTree = ""; }; 978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = ""; }; A1AD210B87A46DBD057A7D28 /* Navigation.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Navigation.generated.swift; sourceTree = ""; }; A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = LifecycleViewModel.generated.swift; sourceTree = ""; }; @@ -553,6 +555,7 @@ 8165D122BD8D8848D7242385 /* UninitializedSubject.generated.swift */, 2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */, 944D74BABB71F3B76E746EC8 /* TintedImage+Image.generated.swift */, + 9730959B8EF5B66133F731D2 /* ShapeView.generated.swift */, ); path = KalugaSwiftUI; sourceTree = ""; @@ -801,6 +804,7 @@ 1529FF0B35BD7AB3B6E838A9 /* UninitializedSubject.generated.swift in Sources */, 9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */, FEA04DB9D0C154DAAC5F351C /* TintedImage+Image.generated.swift in Sources */, + D0F06CF9B138426F812F3B0B /* ShapeView.generated.swift in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index d46183cea..38af07e45 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -1,7 +1,7 @@ [versions] kaluga = "1.6.0" -androidGradle = "8.7.1" +androidGradle = "8.7.2" androidBuildTools = "34.0.0" androidCompileSdk = "35" androidMinSdk = "24" @@ -18,21 +18,21 @@ kotlinx-coroutines = "1.9.0" kotlinx-serialization = "1.7.3" accompanist = "0.36.0" android-material = "1.12.0" -android-play-review = "2.0.1" +android-play-review = "2.0.2" android-play-services-location = "21.3.0" -androidx-activity = "1.9.2" +androidx-activity = "1.9.3" androidx-appcompat = "1.7.0" androidx-arch-core = "2.2.0" androidx-browser = "1.8.0" -androidx-compose = "1.7.3" -androidx-compose-constraintlayout = "1.0.1" -androidx-compose-ui = "1.7.3" -androidx-compose-material = "1.3.0" -androidx-constraintlayout = "2.1.4" -androidx-core = "1.13.1" -androidx-fragment = "1.8.4" -androidx-lifecycle = "2.8.6" -androidx-navigation = "2.8.2" +androidx-compose = "1.7.5" +androidx-compose-constraintlayout = "1.1.0" +androidx-compose-ui = "1.7.5" +androidx-compose-material = "1.3.1" +androidx-constraintlayout = "2.2.0" +androidx-core = "1.15.0" +androidx-fragment = "1.8.5" +androidx-lifecycle = "2.8.7" +androidx-navigation = "2.8.4" androidx-test = "1.6.1" androidx-test-runner = "1.6.2" androidx-test-espresso = "3.6.1" @@ -40,8 +40,7 @@ androidx-test-junit = "1.2.1" androidx-test-uiautomator = "2.3.0" bytebuddy = "1.15.4" junit = "4.13.2" -koin = "3.5.6" -koin-compose = "3.5.6" +koin = "4.0.0" mockito = "5.14.1" napier = "2.7.1" nordic-support = "1.6.0" @@ -192,7 +191,7 @@ junit = { module = "junit:junit", version.ref = "junit" } # Koin koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } -koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin-compose" } +koin-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" } napier = { module = "io.github.aakira:napier", version.ref = "napier" } nordic-support-scanner = { module = "no.nordicsemi.android.support.v18:scanner", version.ref = "nordic-support" } From fffa0214dd52beacab2235788ed62abe29bacdbf Mon Sep 17 00:00:00 2001 From: Gijs van Veen Date: Fri, 15 Nov 2024 13:56:20 +0100 Subject: [PATCH 2/3] Fixed Kaluga SwiftUI not tracking --- example/ios/Kaluga-SwiftUI | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/example/ios/Kaluga-SwiftUI b/example/ios/Kaluga-SwiftUI index eb8f69d94..36dfac6d7 160000 --- a/example/ios/Kaluga-SwiftUI +++ b/example/ios/Kaluga-SwiftUI @@ -1 +1 @@ -Subproject commit eb8f69d9406ed5881de5d32e88c704c85c341f81 +Subproject commit 36dfac6d7c6b9f10ea78fabdd103893e8fd64e11 From 03f28dd6494852a55903b9496659fa7c9a685d4c Mon Sep 17 00:00:00 2001 From: Gijs van Veen Date: Fri, 15 Nov 2024 14:52:37 +0100 Subject: [PATCH 3/3] Fixed broken project file --- example/ios/Demo.xcodeproj/project.pbxproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/example/ios/Demo.xcodeproj/project.pbxproj b/example/ios/Demo.xcodeproj/project.pbxproj index e40a05027..bfaee8b17 100644 --- a/example/ios/Demo.xcodeproj/project.pbxproj +++ b/example/ios/Demo.xcodeproj/project.pbxproj @@ -87,7 +87,6 @@ 8679BDAA7F79F92DAC24AF23 /* ListObservable.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 31718DE342D28B4942D37524 /* ListObservable.generated.swift */; }; 93EC5B31E0ADDED3225B15C9 /* Color+Color.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12F49DA13243DC3767266475 /* Color+Color.generated.swift */; }; 9481F22DC3CFE170CE894584 /* KeyboardManager.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2F34DFA21F534655B6FD3D03 /* KeyboardManager.generated.swift */; }; - C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4A2BAEDD60E67CE8F9277AC6 /* Shape+Helpers.generated.swift */; }; C77C23B538A4DFB02C0E0773 /* LazyView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 095989173871C8CDA70C49E1 /* LazyView.generated.swift */; }; C9555693B015ADE12795997D /* NavigationBarColor.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7C9189D92DAF37F9815ECFDC /* NavigationBarColor.generated.swift */; }; D0F06CF9B138426F812F3B0B /* ShapeView.generated.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9730959B8EF5B66133F731D2 /* ShapeView.generated.swift */; }; @@ -216,7 +215,7 @@ 89DAFF461D97215C4B63A0A1 /* PlatformMappers.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = PlatformMappers.generated.swift; sourceTree = ""; }; 93070CB7E1723F904DBEDD26 /* DefaultValues.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = DefaultValues.generated.swift; sourceTree = ""; }; 944D74BABB71F3B76E746EC8 /* TintedImage+Image.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = "TintedImage+Image.generated.swift"; sourceTree = ""; }; - 9730959B8EF5B66133F731D2 /* ShapeView.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; lastKnownFileType = sourcecode.swift; name = ShapeView.generated.swift; path = ShapeView.generated.swift; sourceTree = ""; }; + 9730959B8EF5B66133F731D2 /* ShapeView.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = ShapeView.generated.swift; sourceTree = ""; }; 978348A6235DF586005B140B /* PermissionViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PermissionViewController.swift; sourceTree = ""; }; A1AD210B87A46DBD057A7D28 /* Navigation.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = Navigation.generated.swift; sourceTree = ""; }; A8678F48E60D40E6AB06177C /* LifecycleViewModel.generated.swift */ = {isa = PBXFileReference; explicitFileType = sourcecode.swift; path = LifecycleViewModel.generated.swift; sourceTree = ""; }; @@ -794,7 +793,6 @@ 37B9F4481D30F2FC895AB554 /* PlatformValueMapper.generated.swift in Sources */, 20FFB48E293F818B005CF1C8 /* BottomSheetView.swift in Sources */, 847C2A647F23AF46CED079CF /* RoutingState.generated.swift in Sources */, - C0C827F580A4F1950E9B10EE /* Shape+Helpers.generated.swift in Sources */, 300D5D65F49D6711AC8FF5DA /* Subject.generated.swift in Sources */, 20BB9E722963281D0096E836 /* MainStoryboard.swift in Sources */, 20FFB48A293EB4F0005CF1C8 /* ArchitectureView.swift in Sources */,