Upgrade samples to use Realm Kotlin 1.15.0 (#47)

realm · Apr 19, 2024 · 625774c · 625774c
1 parent 131de27
commit 625774c
Show file tree

Hide file tree

Showing 24 changed files with 174 additions and 79 deletions.
diff --git a/Bookshelf/androidApp/build.gradle.kts b/Bookshelf/androidApp/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
 }
 
 // https://maven.google.com/web/index.html?q=compiler#androidx.compose.compiler:compiler
-val compose_compiler_version = "1.4.6"
+val compose_compiler_version = "1.5.2"
 // https://maven.google.com/web/index.html?q=ui#androidx.compose.ui:ui
 val compose_ui_version = "1.4.3"
 

diff --git a/Bookshelf/build.gradle.kts b/Bookshelf/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.8.20" apply false
+    kotlin("multiplatform") version "1.9.0" apply false
     id("com.android.library") version "7.3.0" apply false
 }
 
@@ -8,10 +8,10 @@ plugins {
 // marker interface so would need to be added to the classpath manually anyway.
 buildscript {
     dependencies {
-        classpath("io.realm.kotlin:gradle-plugin:1.9.0")
+        classpath("io.realm.kotlin:gradle-plugin:1.15.0")
     }
 }
-rootProject.extra["realmVersion"] = "1.9.0"
+rootProject.extra["realmVersion"] = "1.15.0"
 
 allprojects {
     group = "io.realm.sample.bookshelf"

diff --git a/Bookshelf/iosApp/Pods/Pods.xcodeproj/project.pbxproj b/Bookshelf/iosApp/Pods/Pods.xcodeproj/project.pbxproj
diff --git a/Bookshelf/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig b/Bookshelf/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig
diff --git a/Bookshelf/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig b/Bookshelf/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig
diff --git a/Bookshelf/iosApp/iosApp.xcodeproj/project.pbxproj b/Bookshelf/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -105,6 +105,7 @@
 				7555FF77242A565900829871 /* Sources */,
 				7555FF79242A565900829871 /* Resources */,
 				32057199A02BE64AEB9F6BA2 /* Frameworks */,
+				EAEE7756A503E98FBD25F933 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -183,6 +184,23 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		EAEE7756A503E98FBD25F933 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */

diff --git a/Bookshelf/shared/build.gradle.kts b/Bookshelf/shared/build.gradle.kts
@@ -4,7 +4,7 @@ plugins {
     kotlin("multiplatform")
     kotlin("native.cocoapods")
     id("com.android.library")
-    kotlin("plugin.serialization") version "1.7.20"
+    kotlin("plugin.serialization") version "1.9.0"
     id("io.realm.kotlin")
 }
 
@@ -54,7 +54,7 @@ kotlin {
                 implementation("io.ktor:ktor-client-android:$ktorVersion")
             }
         }
-        val androidTest by getting {
+        val androidInstrumentedTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")

diff --git a/Intro/build.gradle.kts b/Intro/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.8.20" apply false
+    kotlin("multiplatform") version "1.9.0" apply false
     id("com.android.library") version "7.3.0" apply false
 }
 
@@ -8,10 +8,10 @@ plugins {
 // marker interface so would need to be added to the classpath manually anyway.
 buildscript {
     dependencies {
-        classpath("io.realm.kotlin:gradle-plugin:1.9.0")
+        classpath("io.realm.kotlin:gradle-plugin:1.15.0")
     }
 }
-rootProject.extra["realmVersion"] = "1.9.0"
+rootProject.extra["realmVersion"] = "1.15.0"
 
 group = "io.realm.example"
 version = "1.0.0"
diff --git a/Intro/gradle.properties b/Intro/gradle.properties
@@ -20,7 +20,5 @@ org.gradle.jvmargs=-Xms512m -Xmx2048m
 kotlin.code.style=official
 xcodeproj=./iosApp
 android.useAndroidX=true
-kotlin.mpp.enableGranularSourceSetsMetadata=true
-kotlin.native.enableDependencyPropagation=false
 
 kotlin.mpp.stability.nowarn=true
diff --git a/Intro/shared/build.gradle.kts b/Intro/shared/build.gradle.kts
@@ -52,7 +52,7 @@ kotlin {
                 implementation("com.google.android.material:material:1.6.1")
             }
         }
-        val androidTest by getting {
+        val androidInstrumentedTest by getting {
             dependencies {
                 implementation(kotlin("test-junit"))
                 implementation("junit:junit:4.13.2")

diff --git a/JVMConsole/build.gradle.kts b/JVMConsole/build.gradle.kts
@@ -1,16 +1,16 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.7.20"
+    kotlin("jvm") version "1.9.0"
     application
 }
 
 buildscript {
     dependencies {
-        classpath("io.realm.kotlin:gradle-plugin:1.9.0")
+        classpath("io.realm.kotlin:gradle-plugin:1.15.0")
     }
 }
-rootProject.extra["realmVersion"] = "1.9.0"
+rootProject.extra["realmVersion"] = "1.15.0"
 
 apply(plugin = "io.realm.kotlin")
 

diff --git a/JavaKotlinMavenInterop/build.gradle.kts b/JavaKotlinMavenInterop/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
     kotlin("jvm") version "1.9.21" apply false
-    id("io.realm.kotlin") version "1.13.0" apply false
+    id("io.realm.kotlin") version "1.15.0" apply false
 }
-rootProject.extra["realmVersion"] = "1.13.0"
+rootProject.extra["realmVersion"] = "1.15.0"
diff --git a/MultiplatformDemo/androidApp/build.gradle.kts b/MultiplatformDemo/androidApp/build.gradle.kts
@@ -4,9 +4,9 @@ plugins {
 }
 
 // https://maven.google.com/web/index.html?q=compiler#androidx.compose.compiler:compiler
-val compose_compiler_version = "1.4.6"
+val compose_compiler_version = "1.5.3" // Kotlin 1.9.10
 // https://maven.google.com/web/index.html?q=ui#androidx.compose.ui:ui
-val compose_ui_version = "1.4.3"
+val compose_ui_version = "1.6.5"
 
 dependencies {
     implementation(project(":shared"))
@@ -15,11 +15,11 @@ dependencies {
     implementation("androidx.compose.material:material:$compose_ui_version")
     implementation("androidx.compose.ui:ui:$compose_ui_version")
     implementation("androidx.compose.ui:ui-tooling:$compose_ui_version")
-    implementation("androidx.activity:activity-compose:1.4.0-beta01")
+    implementation("androidx.activity:activity-compose:1.8.2")
 }
 
 android {
-    compileSdk = 33
+    compileSdk = 34
     defaultConfig {
         applicationId = "io.realm.kotlin.demo"
         minSdk = 21
@@ -29,7 +29,7 @@ android {
     }
     buildTypes {
         getByName("release") {
-            isMinifyEnabled = false
+            isMinifyEnabled = true
         }
     }
 
@@ -45,4 +45,8 @@ android {
     composeOptions {
         kotlinCompilerExtensionVersion = compose_compiler_version
     }
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_11
+        targetCompatibility = JavaVersion.VERSION_11
+    }
 }
diff --git a/MultiplatformDemo/build.gradle.kts b/MultiplatformDemo/build.gradle.kts
@@ -1,5 +1,5 @@
 plugins {
-    kotlin("multiplatform") version "1.8.20" apply false
+    kotlin("multiplatform") version "1.9.10" apply false
     id("com.android.library") version "7.3.0" apply false
 }
 
@@ -8,10 +8,10 @@ plugins {
 // marker interface so would need to be added to the classpath manually anyway.
 buildscript {
     dependencies {
-        classpath("io.realm.kotlin:gradle-plugin:1.9.0")
+        classpath("io.realm.kotlin:gradle-plugin:1.15.0")
     }
 }
-rootProject.extra["realmVersion"] = "1.9.0"
+rootProject.extra["realmVersion"] = "1.15.0"
 
 allprojects {
     group = "io.realm.sample"

diff --git a/MultiplatformDemo/iosApp/iosApp.xcodeproj/project.pbxproj b/MultiplatformDemo/iosApp/iosApp.xcodeproj/project.pbxproj
@@ -171,6 +171,7 @@
 				832C51992707A71D0086207A /* Sources */,
 				832C519A2707A71D0086207A /* Frameworks */,
 				832C519B2707A71D0086207A /* Resources */,
+				68B02319287E41C0AE1AE700 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -286,6 +287,23 @@
 /* End PBXResourcesBuildPhase section */
 
 /* Begin PBXShellScriptBuildPhase section */
+		68B02319287E41C0AE1AE700 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-iosApp/Pods-iosApp-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		8C402E86F1F86FFE5FF3EA13 /* [CP] Check Pods Manifest.lock */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;