Merge pull request #30 from Kotlin/version-updates

Update dependencies

Author: zsmb13

.github/README.md renamed to .github/CLEAN_README.md

@@ -21,6 +21,6 @@ jobs:
           distribution: 'zulu'
           java-version: 21
       - name: Set Xcode version
-        run: sudo xcode-select -s /Applications/Xcode_15.3.app/Contents/Developer
+        run: sudo xcode-select -s /Applications/Xcode_16.2.app/Contents/Developer
       - name: iOS debug build
-        run: cd iosApp && xcodebuild -scheme iosApp -configuration Debug -destination 'platform=iOS Simulator,OS=latest,name=iPhone 15' CODE_SIGNING_ALLOWED='NO'
+        run: cd iosApp && xcodebuild -scheme iosApp -configuration Debug -destination 'platform=iOS Simulator,OS=latest,name=iPhone 16' CODE_SIGNING_ALLOWED='NO'

.github/workflows/build-ios.yml

@@ -22,7 +22,7 @@ jobs:
 
       - name: Cleanup
         run: |
-          mv .github/README.md README.md
+          mv .github/CLEAN_README.md README.md
           rm LICENSE
           rm -rf .github
 

.github/workflows/template-cleanup.yml

@@ -7,3 +7,6 @@ org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8
 #Android
 android.nonTransitiveRClass=true
 android.useAndroidX=true
+
+# Workaround for https://youtrack.jetbrains.com/issue/KT-74278/, should be fixed in Kotlin 2.2.0
+kotlin.native.toolchain.enabled=false

gradle.properties

@@ -1,18 +1,18 @@
 [versions]
 agp = "8.6.1"
-androidx-activityCompose = "1.9.3"
-androidx-navigationCompose = "2.8.3"
-androidx-ui-tooling = "1.7.4"
-androidx-viewmodelCompose = "2.8.6"
-coil = "3.0.0-rc02"
-compose-multiplatform = "1.7.0"
-kmpObservableViewmodel = "1.0.0-BETA-7"
-kmpNativeCoroutines = "1.0.0-ALPHA-37"
-koin = "4.0.0"
-kotlin = "2.0.21"
-kotlinx-serialization = "1.7.3"
-ksp = "2.0.21-1.0.25"
-ktor = "3.0.0"
+androidx-activityCompose = "1.10.1"
+androidx-navigationCompose = "2.8.9"
+androidx-ui-tooling = "1.7.8"
+androidx-viewmodelCompose = "2.8.7"
+coil = "3.1.0"
+compose-multiplatform = "1.7.3"
+kmpObservableViewmodel = "1.0.0-BETA-10"
+kmpNativeCoroutines = "1.0.0-ALPHA-41"
+koin = "4.0.3"
+kotlin = "2.1.20"
+kotlinx-serialization = "1.8.1"
+ksp = "2.1.20-1.0.31"
+ktor = "3.1.1"
 
 [libraries]
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" }

gradle/libs.versions.toml

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradle/wrapper/gradle-wrapper.jar

@@ -86,8 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
-' "$PWD" ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -206,7 +205,7 @@ fi
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Collect all arguments for the java command:
-#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
 #     and any embedded shellness will be escaped.
 #   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
 #     treated as '${Hostname}' itself on the command line.

gradle/wrapper/gradle-wrapper.properties

@@ -417,15 +417,15 @@
 			repositoryURL = "https://github.com/rickclephas/KMP-ObservableViewModel";
 			requirement = {
 				kind = exactVersion;
-				version = "1.0.0-BETA-7";
+				version = "1.0.0-BETA-10";
 			};
 		};
 		EB50C48E2BE0EB69005DE781 /* XCRemoteSwiftPackageReference "KMP-NativeCoroutines" */ = {
 			isa = XCRemoteSwiftPackageReference;
 			repositoryURL = "https://github.com/rickclephas/KMP-NativeCoroutines.git";
 			requirement = {
 				kind = exactVersion;
-				version = "1.0.0-ALPHA-37-spm-async";
+				version = "1.0.0-ALPHA-41-spm-async";
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

gradlew

@@ -6,17 +6,17 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/rickclephas/KMP-NativeCoroutines.git",
       "state" : {
-        "revision" : "398072f9a010122bbcfff78040681743442fa8d6",
-        "version" : "1.0.0-ALPHA-37-spm-async"
+        "revision" : "3553f4bfccf904f7cd58f3f32761d61c4e1640ea",
+        "version" : "1.0.0-ALPHA-41-spm-async"
       }
     },
     {
       "identity" : "kmp-observableviewmodel",
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/rickclephas/KMP-ObservableViewModel",
       "state" : {
-        "revision" : "805c41ff1305b02909c3b50a7e34a46b3c029c04",
-        "version" : "1.0.0-BETA-7"
+        "revision" : "4515918e84556c234b057f26dcdc3478df99b487",
+        "version" : "1.0.0-BETA-10"
       }
     }
   ],

iosApp/iosApp.xcodeproj/project.pbxproj

@@ -21,7 +21,7 @@ struct ListView: View {
                         LazyVGrid(columns: columns, alignment: .leading, spacing: 20) {
                             ForEach(viewModel.objects, id: \.self) { item in
                                 NavigationLink(destination: DetailView(objectId: item.objectID)) {
-                                    ObjectFrame(obj: item, onClick: {})
+                                    ObjectFrame(obj: item)
                                 }
                                 .buttonStyle(PlainButtonStyle())
                             }
@@ -38,7 +38,6 @@ struct ListView: View {
 
 struct ObjectFrame: View {
     let obj: MuseumObject
-    let onClick: () -> Void
 
     var body: some View {
         VStack(alignment: .leading, spacing: 4) {