Skip to content

Commit 997664e

Browse files
rickclephasrickclephas
authored
Merge pull request #100 from rickclephas/feature/kotlin-2.3.0
Kotlin 2.3.0
2 parents f6f15e9 + 16dc060 commit 997664e

File tree

7 files changed

+36
-25
lines changed

7 files changed

+36
-25
lines changed

‎.idea/kotlinc.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@ buildscript {
88

99
allprojects {
1010
group = "com.rickclephas.kmp"
11-
version = "1.0.0"
11+
version = "1.0.0-kotlin-2.3.0-RC3"
1212
}

‎gradle/libs.versions.toml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
[versions]
2-
kotlin = "2.2.21"
2+
kotlin = "2.3.0"
33
kotlinx-coroutines = "1.10.1"
4-
android = "8.2.0"
4+
android = "8.2.2"
55
androidx-lifecycle = "2.8.7"
6-
atomicfu = "0.27.0"
6+
atomicfu = "0.29.0"
77

88
# Sample versions
99
androidx-compose = "2023.10.01"
1010
androidx-fragment = "1.6.2"
11-
nativecoroutines = "1.0.0-ALPHA-48"
11+
nativecoroutines = "1.0.0"
1212

1313
[libraries]
1414
kotlin-gradle-plugin = { module = "org.jetbrains.kotlin:kotlin-gradle-plugin", version.ref = "kotlin" }
@@ -35,7 +35,7 @@ atomicfu = { id = "org.jetbrains.kotlinx.atomicfu", version.ref = "atomicfu" }
3535

3636
# Sample plugins
3737
kotlin-android = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
38-
jetbrains-compose = { id = "org.jetbrains.compose", version = "1.6.11" }
38+
jetbrains-compose = { id = "org.jetbrains.compose", version = "1.8.1" }
3939
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
4040
android-application = { id = "com.android.application", version.ref = "android" }
4141
nativecoroutines = { id = "com.rickclephas.kmp.nativecoroutines", version.ref = "nativecoroutines" }

‎kotlin-js-store/yarn.lock‎

Lines changed: 16 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -718,7 +718,7 @@ engine.io@~6.6.0:
718718
engine.io-parser "~5.2.1"
719719
ws "~8.17.1"
720720

721-
enhanced-resolve@^5.17.2:
721+
enhanced-resolve@^5.17.3:
722722
version "5.18.3"
723723
resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz#9b5f4c5c076b8787c78fe540392ce76a88855b44"
724724
integrity sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==
@@ -1187,10 +1187,9 @@ [email protected]:
11871187
minimatch "^9.0.3"
11881188
webpack-merge "^4.1.5"
11891189

1190-
[email protected].4:
1190+
"karma@github:Kotlin/karma#6.4.5":
11911191
version "6.4.4"
1192-
resolved "https://registry.yarnpkg.com/karma/-/karma-6.4.4.tgz#dfa5a426cf5a8b53b43cd54ef0d0d09742351492"
1193-
integrity sha512-LrtUxbdvt1gOpo3gxG+VAJlJAEMhbWlM4YrFQgql98FwF7+K8K12LYO4hnDdUkNjeztYrOXEMqgTajSWgmtI/w==
1192+
resolved "https://codeload.github.com/Kotlin/karma/tar.gz/239a8fc984584f0d96b1dd750e7a5e2c79da93a6"
11941193
dependencies:
11951194
"@colors/colors" "1.5.0"
11961195
body-parser "^1.19.0"
@@ -1222,10 +1221,10 @@ kind-of@^6.0.2:
12221221
resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd"
12231222
integrity sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==
12241223

1225-
kotlin-web-helpers@2.1.0:
1226-
version "2.1.0"
1227-
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-2.1.0.tgz#6cd4b0f0dc3baea163929c8638155b8d19c55a74"
1228-
integrity sha512-NAJhiNB84tnvJ5EQx7iER3GWw7rsTZkX9HVHZpe7E3dDBD/dhTzqgSwNU3MfQjniy2rB04bP24WM9Z32ntUWRg==
1224+
kotlin-web-helpers@3.0.0:
1225+
version "3.0.0"
1226+
resolved "https://registry.yarnpkg.com/kotlin-web-helpers/-/kotlin-web-helpers-3.0.0.tgz#3ed6b48f694f74bb60a737a9d7e2c0e3b29abdb9"
1227+
integrity sha512-kdQO4AJQkUPvpLh9aglkXDRyN+CfXO7pKq+GESEnxooBFkQpytLrqZis3ABvmFN1cGw/ZQ/K38u5sRGW+NfBnw==
12291228
dependencies:
12301229
format-util "^1.0.5"
12311230

@@ -1335,10 +1334,10 @@ mkdirp@^0.5.5:
13351334
dependencies:
13361335
minimist "^1.2.6"
13371336

1338-
[email protected].1:
1339-
version "11.7.1"
1340-
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.1.tgz#91948fecd624fb4bd154ed260b7e1ad3910d7c7a"
1341-
integrity sha512-5EK+Cty6KheMS/YLPPMJC64g5V61gIR25KsRItHw6x4hEKT6Njp1n9LOlH4gpevuwMVS66SXaBBpg+RWZkza4A==
1337+
[email protected].2:
1338+
version "11.7.2"
1339+
resolved "https://registry.yarnpkg.com/mocha/-/mocha-11.7.2.tgz#3c0079fe5cc2f8ea86d99124debcc42bb1ab22b5"
1340+
integrity sha512-lkqVJPmqqG/w5jmmFtiRvtA2jkDyNVUcefFJKb2uyX4dekk8Okgqop3cgbFiaIvj8uCRJVTP5x9dfxGyXm2jvQ==
13421341
dependencies:
13431342
browser-stdout "^1.3.1"
13441343
chokidar "^4.0.1"
@@ -1949,10 +1948,10 @@ webpack-sources@^3.3.3:
19491948
resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.3.3.tgz#d4bf7f9909675d7a070ff14d0ef2a4f3c982c723"
19501949
integrity sha512-yd1RBzSGanHkitROoPFd6qsrxt+oFhg/129YzheDGqeustzX0vTZJZsSsQjVQC4yzBQ56K55XU8gaNCtIzOnTg==
19511950

1952-
webpack@5.100.2:
1953-
version "5.100.2"
1954-
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.100.2.tgz#e2341facf9f7de1d702147c91bcb65b693adf9e8"
1955-
integrity sha512-QaNKAvGCDRh3wW1dsDjeMdDXwZm2vqq3zn6Pvq4rHOEOGSaUMgOOjG2Y9ZbIGzpfkJk9ZYTHpDqgDfeBDcnLaw==
1951+
webpack@5.101.3:
1952+
version "5.101.3"
1953+
resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.101.3.tgz#3633b2375bb29ea4b06ffb1902734d977bc44346"
1954+
integrity sha512-7b0dTKR3Ed//AD/6kkx/o7duS8H3f1a4w3BYpIriX4BzIhjkn4teo05cptsxvLesHFKK5KObnadmCHBwGc+51A==
19561955
dependencies:
19571956
"@types/eslint-scope" "^3.7.7"
19581957
"@types/estree" "^1.0.8"
@@ -1964,7 +1963,7 @@ [email protected]:
19641963
acorn-import-phases "^1.0.3"
19651964
browserslist "^4.24.0"
19661965
chrome-trace-event "^1.0.2"
1967-
enhanced-resolve "^5.17.2"
1966+
enhanced-resolve "^5.17.3"
19681967
es-module-lexer "^1.2.1"
19691968
eslint-scope "5.1.1"
19701969
events "^3.2.0"

‎sample/androidApp/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ plugins {
66

77
android {
88
namespace = "com.rickclephas.kmp.observableviewmodel.sample"
9-
compileSdk = 34
9+
compileSdk = 35
1010
defaultConfig {
1111
applicationId = "com.rickclephas.kmp.observableviewmodel.sample"
1212
minSdk = 28

‎sample/iosApp/KMPObservableViewModelSample.xcodeproj/project.pbxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
1D44EF8E292C066C00465C43 /* KMPObservableViewModelSampleUITests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = KMPObservableViewModelSampleUITests.xctest; sourceTree = BUILT_PRODUCTS_DIR; };
5252
1D44EF92292C066C00465C43 /* KMPObservableViewModelSampleUITests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPObservableViewModelSampleUITests.swift; sourceTree = "<group>"; };
5353
1D44EF94292C066C00465C43 /* KMPObservableViewModelSampleUITestsLaunchTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPObservableViewModelSampleUITestsLaunchTests.swift; sourceTree = "<group>"; };
54+
1D60525F2EBF979B008B7573 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist; path = Info.plist; sourceTree = "<group>"; };
5455
1DC34F692EAE33550063597A /* RootView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RootView.swift; sourceTree = "<group>"; };
5556
1DCF89A82933928600A4C54A /* KMP-ObservableViewModel */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = "KMP-ObservableViewModel"; path = ../..; sourceTree = "<group>"; };
5657
1DDAF21F2935470A0049C114 /* KMPObservableViewModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = KMPObservableViewModel.swift; sourceTree = "<group>"; };
@@ -110,6 +111,7 @@
110111
1D44EF76292C066B00465C43 /* KMPObservableViewModelSample */ = {
111112
isa = PBXGroup;
112113
children = (
114+
1D60525F2EBF979B008B7573 /* Info.plist */,
113115
1D44EF7B292C066C00465C43 /* Assets.xcassets */,
114116
1DDE18842E114DE500227AE6 /* ChangeCounter.swift */,
115117
1DF227AF2C2856BC00D8B3A7 /* ContentViewCompose.swift */,
@@ -488,6 +490,7 @@
488490
ENABLE_PREVIEWS = YES;
489491
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
490492
GENERATE_INFOPLIST_FILE = YES;
493+
INFOPLIST_FILE = KMPObservableViewModelSample/Info.plist;
491494
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
492495
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
493496
INFOPLIST_KEY_UILaunchScreen_Generation = YES;
@@ -522,6 +525,7 @@
522525
ENABLE_PREVIEWS = YES;
523526
FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)";
524527
GENERATE_INFOPLIST_FILE = YES;
528+
INFOPLIST_FILE = KMPObservableViewModelSample/Info.plist;
525529
INFOPLIST_KEY_UIApplicationSceneManifest_Generation = YES;
526530
INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
527531
INFOPLIST_KEY_UILaunchScreen_Generation = YES;

‎sample/iosApp/KMPObservableViewModelSample/Info.plist‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
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+
<key>CADisableMinimumFrameDurationOnPhone</key>
6+
<true/>
7+
</dict>
8+
</plist>

0 commit comments

Comments
 (0)