From 46c6989606bb3825b2939d4f707cad68891eba21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Thu, 18 Apr 2024 11:58:12 +0200 Subject: [PATCH 1/5] Upgrade samples to use Realm Kotlin 1.15.0 --- Bookshelf/androidApp/build.gradle.kts | 2 +- Bookshelf/build.gradle.kts | 6 +- .../Pods/Pods.xcodeproj/project.pbxproj | 72 ++++++++++--------- .../Pods-iosApp/Pods-iosApp.debug.xcconfig | 2 +- .../Pods-iosApp/Pods-iosApp.release.xcconfig | 2 +- .../iosApp/iosApp.xcodeproj/project.pbxproj | 18 +++++ Bookshelf/shared/build.gradle.kts | 4 +- Intro/build.gradle.kts | 6 +- Intro/gradle.properties | 2 - Intro/shared/build.gradle.kts | 2 +- JVMConsole/build.gradle.kts | 6 +- JavaKotlinMavenInterop/build.gradle.kts | 4 +- MultiplatformDemo/androidApp/build.gradle.kts | 12 ++-- MultiplatformDemo/build.gradle.kts | 6 +- .../iosApp/iosApp.xcodeproj/project.pbxproj | 18 +++++ MultiplatformDemo/jvmApp/build.gradle.kts | 4 +- .../macosApp.xcodeproj/project.pbxproj | 18 +++++ MultiplatformDemo/shared/build.gradle.kts | 6 +- .../androidApp/build.gradle.kts | 10 +-- MultiplatformDemoWithSync/build.gradle.kts | 8 +-- .../iosApp/iosApp.xcodeproj/project.pbxproj | 18 +++++ .../jvmApp/build.gradle.kts | 5 +- .../macosApp.xcodeproj/project.pbxproj | 18 +++++ .../shared/build.gradle.kts | 4 +- 24 files changed, 176 insertions(+), 77 deletions(-) diff --git a/Bookshelf/androidApp/build.gradle.kts b/Bookshelf/androidApp/build.gradle.kts index ae00515..49bd571 100644 --- 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 index 75bbd7b..80913d3 100644 --- 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 index 2cd3133..e10a9fb 100644 --- a/Bookshelf/iosApp/Pods/Pods.xcodeproj/project.pbxproj +++ b/Bookshelf/iosApp/Pods/Pods.xcodeproj/project.pbxproj @@ -21,8 +21,8 @@ /* Begin PBXBuildFile section */ 648F16425FEF89525AE0325F5A984B86 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 73010CC983E3809BECEE5348DA1BB8C6 /* Foundation.framework */; }; - 8749C8E8DC500B064FA0BC7A78C38A2A /* Pods-iosApp-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 3A2475209BEE7612101900020629C625 /* Pods-iosApp-dummy.m */; }; - 8801CBFD38B946597BD07145B2EEFC9F /* Pods-iosApp-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = 42DE4C0106600A5B6D599285368F3270 /* Pods-iosApp-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; + 8749C8E8DC500B064FA0BC7A78C38A2A /* Pods-iosApp-dummy.m in Sources */ = {isa = PBXBuildFile; fileRef = 54DC7F9924F99FEE67A9AD3BEE09A10C /* Pods-iosApp-dummy.m */; }; + 8801CBFD38B946597BD07145B2EEFC9F /* Pods-iosApp-umbrella.h in Headers */ = {isa = PBXBuildFile; fileRef = F87A626222A8D9B26448A9FEB04FD0DF /* Pods-iosApp-umbrella.h */; settings = {ATTRIBUTES = (Public, ); }; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -36,20 +36,21 @@ /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ - 0011AEE22E8296B3D9E0B0B2CDCAB2EE /* Pods-iosApp-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-acknowledgements.plist"; sourceTree = ""; }; - 1A2FB55B5C37861BC78ECD1420D818C3 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.release.xcconfig"; sourceTree = ""; }; + 0187F135D5F61750CD24C3E04B6E8B64 /* Pods-iosApp-frameworks.sh */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.script.sh; path = "Pods-iosApp-frameworks.sh"; sourceTree = ""; }; 35548E3BD8DA30925E8FE97E67B84868 /* shared.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = shared.release.xcconfig; sourceTree = ""; }; - 3A2475209BEE7612101900020629C625 /* Pods-iosApp-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-iosApp-dummy.m"; sourceTree = ""; }; - 42DE4C0106600A5B6D599285368F3270 /* Pods-iosApp-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-iosApp-umbrella.h"; sourceTree = ""; }; - 482384ADFE4EF692B16FACB8C2021970 /* Pods-iosApp.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-iosApp.modulemap"; sourceTree = ""; }; + 3F64BADB16C311E9D09DAD0116F684F4 /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; + 54DC7F9924F99FEE67A9AD3BEE09A10C /* Pods-iosApp-dummy.m */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.objc; path = "Pods-iosApp-dummy.m"; sourceTree = ""; }; + 5AC974169B09D4545F741E9A2147610E /* Pods-iosApp-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-Info.plist"; sourceTree = ""; }; 73010CC983E3809BECEE5348DA1BB8C6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS14.0.sdk/System/Library/Frameworks/Foundation.framework; sourceTree = DEVELOPER_DIR; }; 73D4D08B8C9FAD17B10E8E5C0EB49A76 /* shared.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = shared.framework; path = build/cocoapods/framework/shared.framework; sourceTree = ""; }; + 8B524AABE529FB8A2D151B05321336E0 /* Pods-iosApp.modulemap */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.module; path = "Pods-iosApp.modulemap"; sourceTree = ""; }; 95B09EA82E7AF9ACCCCAF3E55C859116 /* shared.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = shared.debug.xcconfig; sourceTree = ""; }; + 9BB0B8B698D4C35D4F9A07EF70910170 /* Pods-iosApp-acknowledgements.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-acknowledgements.plist"; sourceTree = ""; }; 9D940727FF8FB9C785EB98E56350EF41 /* Podfile */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; name = Podfile; path = ../Podfile; sourceTree = SOURCE_ROOT; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; - A43877303056397968EC90C7AAFE17E8 /* Pods-iosApp-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-iosApp-acknowledgements.markdown"; sourceTree = ""; }; - A79C2AA5C063914B2D1BD80187FDF6DE /* Pods-iosApp.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.debug.xcconfig"; sourceTree = ""; }; + 9F1FFC8B10F4D7D4F37606E8959B3F29 /* Pods-iosApp-acknowledgements.markdown */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text; path = "Pods-iosApp-acknowledgements.markdown"; sourceTree = ""; }; + 9FECCB5AFF87D121F15BA01E683C7932 /* Pods-iosApp.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; path = "Pods-iosApp.release.xcconfig"; sourceTree = ""; }; B097DD7534E741D5C41838011D755842 /* Pods-iosApp */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; name = "Pods-iosApp"; path = Pods_iosApp.framework; sourceTree = BUILT_PRODUCTS_DIR; }; - BCAED803D074E2E9C3B1327F049C8C2A /* Pods-iosApp-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; path = "Pods-iosApp-Info.plist"; sourceTree = ""; }; + F87A626222A8D9B26448A9FEB04FD0DF /* Pods-iosApp-umbrella.h */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = sourcecode.c.h; path = "Pods-iosApp-umbrella.h"; sourceTree = ""; }; FB1BF8BE937671FB0F330C2D28634477 /* shared.podspec */ = {isa = PBXFileReference; explicitFileType = text.script.ruby; includeInIndex = 1; indentWidth = 2; lastKnownFileType = text; path = shared.podspec; sourceTree = ""; tabWidth = 2; xcLanguageSpecificationIdentifier = xcode.lang.ruby; }; /* End PBXFileReference section */ @@ -65,28 +66,20 @@ /* End PBXFrameworksBuildPhase section */ /* Begin PBXGroup section */ - 1F86AA6785DF34AFD5A71790761717DE /* Products */ = { + 11C970DEAE48C6D0282DFE54684F53F1 /* Targets Support Files */ = { isa = PBXGroup; children = ( - B097DD7534E741D5C41838011D755842 /* Pods-iosApp */, + 52A898E555C2DBD7D25A7E44754C3FC6 /* Pods-iosApp */, ); - name = Products; + name = "Targets Support Files"; sourceTree = ""; }; - 310087C345B86EEF25A054485E0BB5CB /* Pods-iosApp */ = { + 1F86AA6785DF34AFD5A71790761717DE /* Products */ = { isa = PBXGroup; children = ( - 482384ADFE4EF692B16FACB8C2021970 /* Pods-iosApp.modulemap */, - A43877303056397968EC90C7AAFE17E8 /* Pods-iosApp-acknowledgements.markdown */, - 0011AEE22E8296B3D9E0B0B2CDCAB2EE /* Pods-iosApp-acknowledgements.plist */, - 3A2475209BEE7612101900020629C625 /* Pods-iosApp-dummy.m */, - BCAED803D074E2E9C3B1327F049C8C2A /* Pods-iosApp-Info.plist */, - 42DE4C0106600A5B6D599285368F3270 /* Pods-iosApp-umbrella.h */, - A79C2AA5C063914B2D1BD80187FDF6DE /* Pods-iosApp.debug.xcconfig */, - 1A2FB55B5C37861BC78ECD1420D818C3 /* Pods-iosApp.release.xcconfig */, + B097DD7534E741D5C41838011D755842 /* Pods-iosApp */, ); - name = "Pods-iosApp"; - path = "Target Support Files/Pods-iosApp"; + name = Products; sourceTree = ""; }; 313FE5FE915A4A924C55AAC02A910D61 /* Development Pods */ = { @@ -97,6 +90,23 @@ name = "Development Pods"; sourceTree = ""; }; + 52A898E555C2DBD7D25A7E44754C3FC6 /* Pods-iosApp */ = { + isa = PBXGroup; + children = ( + 8B524AABE529FB8A2D151B05321336E0 /* Pods-iosApp.modulemap */, + 9F1FFC8B10F4D7D4F37606E8959B3F29 /* Pods-iosApp-acknowledgements.markdown */, + 9BB0B8B698D4C35D4F9A07EF70910170 /* Pods-iosApp-acknowledgements.plist */, + 54DC7F9924F99FEE67A9AD3BEE09A10C /* Pods-iosApp-dummy.m */, + 0187F135D5F61750CD24C3E04B6E8B64 /* Pods-iosApp-frameworks.sh */, + 5AC974169B09D4545F741E9A2147610E /* Pods-iosApp-Info.plist */, + F87A626222A8D9B26448A9FEB04FD0DF /* Pods-iosApp-umbrella.h */, + 3F64BADB16C311E9D09DAD0116F684F4 /* Pods-iosApp.debug.xcconfig */, + 9FECCB5AFF87D121F15BA01E683C7932 /* Pods-iosApp.release.xcconfig */, + ); + name = "Pods-iosApp"; + path = "Target Support Files/Pods-iosApp"; + sourceTree = ""; + }; 569B56E5B05425CAE32676C6049DC8CB /* Pod */ = { isa = PBXGroup; children = ( @@ -131,14 +141,6 @@ name = Frameworks; sourceTree = ""; }; - C9F6DDEE5D76F65BB478A349731F54F4 /* Targets Support Files */ = { - isa = PBXGroup; - children = ( - 310087C345B86EEF25A054485E0BB5CB /* Pods-iosApp */, - ); - name = "Targets Support Files"; - sourceTree = ""; - }; CF1408CF629C7361332E53B88F7BD30C = { isa = PBXGroup; children = ( @@ -146,7 +148,7 @@ 313FE5FE915A4A924C55AAC02A910D61 /* Development Pods */, D210D550F4EA176C3123ED886F8F87F5 /* Frameworks */, 1F86AA6785DF34AFD5A71790761717DE /* Products */, - C9F6DDEE5D76F65BB478A349731F54F4 /* Targets Support Files */, + 11C970DEAE48C6D0282DFE54684F53F1 /* Targets Support Files */, ); sourceTree = ""; }; @@ -276,7 +278,7 @@ /* Begin XCBuildConfiguration section */ 02DDCCED053337F381DEBAFDEC6F354F /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 1A2FB55B5C37861BC78ECD1420D818C3 /* Pods-iosApp.release.xcconfig */; + baseConfigurationReference = 9FECCB5AFF87D121F15BA01E683C7932 /* Pods-iosApp.release.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; @@ -477,7 +479,7 @@ }; AF088B6CD92A52AC4DCB62DEEC871231 /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = A79C2AA5C063914B2D1BD80187FDF6DE /* Pods-iosApp.debug.xcconfig */; + baseConfigurationReference = 3F64BADB16C311E9D09DAD0116F684F4 /* Pods-iosApp.debug.xcconfig */; buildSettings = { ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = NO; CLANG_ENABLE_OBJC_WEAK = NO; 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 index 60daa9a..3f303bf 100644 --- 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 @@ -2,7 +2,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../shared/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -framework "shared" +OTHER_LDFLAGS = $(inherited) -l"c++" -framework "shared" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. 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 index 60daa9a..3f303bf 100644 --- 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 @@ -2,7 +2,7 @@ CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = NO FRAMEWORK_SEARCH_PATHS = $(inherited) "${PODS_ROOT}/../../shared/build/cocoapods/framework" GCC_PREPROCESSOR_DEFINITIONS = $(inherited) COCOAPODS=1 LD_RUNPATH_SEARCH_PATHS = $(inherited) '@executable_path/Frameworks' '@loader_path/Frameworks' -OTHER_LDFLAGS = $(inherited) -ObjC -l"c++" -framework "shared" +OTHER_LDFLAGS = $(inherited) -l"c++" -framework "shared" PODS_BUILD_DIR = ${BUILD_DIR} PODS_CONFIGURATION_BUILD_DIR = ${PODS_BUILD_DIR}/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME) PODS_PODFILE_DIR_PATH = ${SRCROOT}/. diff --git a/Bookshelf/iosApp/iosApp.xcodeproj/project.pbxproj b/Bookshelf/iosApp/iosApp.xcodeproj/project.pbxproj index 109d013..ab04f41 100644 --- 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 index cc3215a..753eff2 100644 --- 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 index fb78113..72206c1 100644 --- 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 index eff7ec4..1bfef7a 100644 --- 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 index 40dbf14..a3666d3 100644 --- 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 index d74338a..9e7c1e1 100644 --- 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 index 4789347..6bb02e8 100644 --- 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 index a648b6a..d9b615d 100644 --- 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.2" // Kotlin 1.9.0 // 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 @@ -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 index 3cad54b..e81f6ea 100644 --- 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 index e114bd1..7e15a3f 100644 --- 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; diff --git a/MultiplatformDemo/jvmApp/build.gradle.kts b/MultiplatformDemo/jvmApp/build.gradle.kts index dc9e2ac..6a8b640 100644 --- a/MultiplatformDemo/jvmApp/build.gradle.kts +++ b/MultiplatformDemo/jvmApp/build.gradle.kts @@ -2,12 +2,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") - id("org.jetbrains.compose") version "1.4.0" // https://plugins.gradle.org/plugin/org.jetbrains.compose + id("org.jetbrains.compose") version "1.6.2" // https://plugins.gradle.org/plugin/org.jetbrains.compose application } repositories { mavenCentral() + google() maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://oss.sonatype.org/content/repositories/snapshots") } @@ -15,7 +16,6 @@ repositories { dependencies { implementation(compose.desktop.currentOs) implementation(project(":shared")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") } tasks.withType { diff --git a/MultiplatformDemo/macosApp/macosApp.xcodeproj/project.pbxproj b/MultiplatformDemo/macosApp/macosApp.xcodeproj/project.pbxproj index e70e47f..a7c932f 100644 --- a/MultiplatformDemo/macosApp/macosApp.xcodeproj/project.pbxproj +++ b/MultiplatformDemo/macosApp/macosApp.xcodeproj/project.pbxproj @@ -173,6 +173,7 @@ 832C509A27067DDA0086207A /* Sources */, 832C509B27067DDA0086207A /* Frameworks */, 832C509C27067DDA0086207A /* Resources */, + 9841ECD4A934A5E36E29D81E /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -288,6 +289,23 @@ /* End PBXResourcesBuildPhase section */ /* Begin PBXShellScriptBuildPhase section */ + 9841ECD4A934A5E36E29D81E /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-macosApp/Pods-macosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-macosApp/Pods-macosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-macosApp/Pods-macosApp-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; D16BDA791402F97A565D248C /* [CP] Check Pods Manifest.lock */ = { isa = PBXShellScriptBuildPhase; buildActionMask = 2147483647; diff --git a/MultiplatformDemo/shared/build.gradle.kts b/MultiplatformDemo/shared/build.gradle.kts index d2b08b0..ad88ff0 100644 --- a/MultiplatformDemo/shared/build.gradle.kts +++ b/MultiplatformDemo/shared/build.gradle.kts @@ -48,7 +48,7 @@ kotlin { } } val androidMain by getting - val androidTest by getting { + val androidInstrumentedTest by getting { dependencies { implementation(kotlin("test-junit")) implementation("junit:junit:4.13.2") @@ -70,4 +70,8 @@ android { minSdk = 21 targetSdk = 33 } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } } diff --git a/MultiplatformDemoWithSync/androidApp/build.gradle.kts b/MultiplatformDemoWithSync/androidApp/build.gradle.kts index 6ff6db1..8e9e9db 100644 --- a/MultiplatformDemoWithSync/androidApp/build.gradle.kts +++ b/MultiplatformDemoWithSync/androidApp/build.gradle.kts @@ -4,23 +4,23 @@ 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" +val compose_ui_version = "1.6.5" dependencies { implementation(project(":shared")) implementation("androidx.compose.compiler:compiler:$compose_compiler_version") implementation("androidx.compose.material:material:$compose_ui_version") - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") + implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.0") implementation("androidx.compose.ui:ui:$compose_ui_version") implementation("androidx.compose.ui:ui-tooling:$compose_ui_version") - implementation("androidx.activity:activity-compose:1.6.0") + implementation("androidx.activity:activity-compose:1.8.2") } android { - compileSdk = 33 + compileSdk = 34 defaultConfig { applicationId = "io.realm.kotlin.demo" minSdk = 21 diff --git a/MultiplatformDemoWithSync/build.gradle.kts b/MultiplatformDemoWithSync/build.gradle.kts index 3cad54b..7d21310 100644 --- a/MultiplatformDemoWithSync/build.gradle.kts +++ b/MultiplatformDemoWithSync/build.gradle.kts @@ -1,6 +1,6 @@ plugins { - kotlin("multiplatform") version "1.8.20" apply false - id("com.android.library") version "7.3.0" apply false + kotlin("multiplatform") version "1.9.10" apply false + id("com.android.library") version "7.3.1" apply false } // Explicitly adding the plugin to the classpath as it makes it easier to control the version @@ -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/MultiplatformDemoWithSync/iosApp/iosApp.xcodeproj/project.pbxproj b/MultiplatformDemoWithSync/iosApp/iosApp.xcodeproj/project.pbxproj index 5feae2d..a1d1ba9 100644 --- a/MultiplatformDemoWithSync/iosApp/iosApp.xcodeproj/project.pbxproj +++ b/MultiplatformDemoWithSync/iosApp/iosApp.xcodeproj/project.pbxproj @@ -171,6 +171,7 @@ 832C51992707A71D0086207A /* Sources */, 832C519A2707A71D0086207A /* Frameworks */, 832C519B2707A71D0086207A /* Resources */, + 9D36ABDEF38ECF93B3E861E1 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -308,6 +309,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; }; + 9D36ABDEF38ECF93B3E861E1 /* [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/MultiplatformDemoWithSync/jvmApp/build.gradle.kts b/MultiplatformDemoWithSync/jvmApp/build.gradle.kts index dc9e2ac..8f820ac 100644 --- a/MultiplatformDemoWithSync/jvmApp/build.gradle.kts +++ b/MultiplatformDemoWithSync/jvmApp/build.gradle.kts @@ -2,12 +2,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile plugins { kotlin("jvm") - id("org.jetbrains.compose") version "1.4.0" // https://plugins.gradle.org/plugin/org.jetbrains.compose + id("org.jetbrains.compose") version "1.6.2" // https://plugins.gradle.org/plugin/org.jetbrains.compose application } repositories { mavenCentral() + google() maven(url = "https://maven.pkg.jetbrains.space/public/p/compose/dev") maven("https://oss.sonatype.org/content/repositories/snapshots") } @@ -15,7 +16,7 @@ repositories { dependencies { implementation(compose.desktop.currentOs) implementation(project(":shared")) - implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4") +// implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.2") } tasks.withType { diff --git a/MultiplatformDemoWithSync/macosApp/macosApp.xcodeproj/project.pbxproj b/MultiplatformDemoWithSync/macosApp/macosApp.xcodeproj/project.pbxproj index 415179e..aaa59a3 100644 --- a/MultiplatformDemoWithSync/macosApp/macosApp.xcodeproj/project.pbxproj +++ b/MultiplatformDemoWithSync/macosApp/macosApp.xcodeproj/project.pbxproj @@ -173,6 +173,7 @@ 832C509A27067DDA0086207A /* Sources */, 832C509B27067DDA0086207A /* Frameworks */, 832C509C27067DDA0086207A /* Resources */, + 69E6BA9075D9705F2C7001D4 /* [CP] Embed Pods Frameworks */, ); buildRules = ( ); @@ -310,6 +311,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; }; + 69E6BA9075D9705F2C7001D4 /* [CP] Embed Pods Frameworks */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-macosApp/Pods-macosApp-frameworks-${CONFIGURATION}-input-files.xcfilelist", + ); + name = "[CP] Embed Pods Frameworks"; + outputFileListPaths = ( + "${PODS_ROOT}/Target Support Files/Pods-macosApp/Pods-macosApp-frameworks-${CONFIGURATION}-output-files.xcfilelist", + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-macosApp/Pods-macosApp-frameworks.sh\"\n"; + showEnvVarsInLog = 0; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ diff --git a/MultiplatformDemoWithSync/shared/build.gradle.kts b/MultiplatformDemoWithSync/shared/build.gradle.kts index f8e1996..24ec36e 100644 --- a/MultiplatformDemoWithSync/shared/build.gradle.kts +++ b/MultiplatformDemoWithSync/shared/build.gradle.kts @@ -49,7 +49,7 @@ kotlin { } } val androidMain by getting - val androidTest by getting { + val androidInstrumentedTest by getting { dependencies { implementation(kotlin("test-junit")) implementation("junit:junit:4.13.2") @@ -65,7 +65,7 @@ kotlin { } android { - compileSdk= 33 + compileSdk= 34 sourceSets["main"].manifest.srcFile("src/androidMain/AndroidManifest.xml") defaultConfig { minSdk = 21 From 90fee82724c44ecc82b3743ab0ceec5523965050 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Thu, 18 Apr 2024 12:43:20 +0200 Subject: [PATCH 2/5] Remove compile options --- MultiplatformDemo/shared/build.gradle.kts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/MultiplatformDemo/shared/build.gradle.kts b/MultiplatformDemo/shared/build.gradle.kts index ad88ff0..06416b0 100644 --- a/MultiplatformDemo/shared/build.gradle.kts +++ b/MultiplatformDemo/shared/build.gradle.kts @@ -70,8 +70,5 @@ android { minSdk = 21 targetSdk = 33 } - compileOptions { - sourceCompatibility = JavaVersion.VERSION_11 - targetCompatibility = JavaVersion.VERSION_11 - } } + From 88ae740e94c4ada4a1d7b008e964a71e6561eeaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Thu, 18 Apr 2024 13:08:58 +0200 Subject: [PATCH 3/5] Match compose compiler with updated Kotlin version --- MultiplatformDemo/androidApp/build.gradle.kts | 2 +- MultiplatformDemoWithSync/androidApp/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiplatformDemo/androidApp/build.gradle.kts b/MultiplatformDemo/androidApp/build.gradle.kts index d9b615d..f39a1d0 100644 --- a/MultiplatformDemo/androidApp/build.gradle.kts +++ b/MultiplatformDemo/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.5.2" // Kotlin 1.9.0 +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.6.5" diff --git a/MultiplatformDemoWithSync/androidApp/build.gradle.kts b/MultiplatformDemoWithSync/androidApp/build.gradle.kts index 8e9e9db..d6f3a2a 100644 --- a/MultiplatformDemoWithSync/androidApp/build.gradle.kts +++ b/MultiplatformDemoWithSync/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.5.2" +val compose_compiler_version = "1.5.3" // https://maven.google.com/web/index.html?q=ui#androidx.compose.ui:ui val compose_ui_version = "1.6.5" From a3c163e9c8da73a4b5b8956a74ebff21fd4890cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Thu, 18 Apr 2024 14:01:01 +0200 Subject: [PATCH 4/5] Enable minifying on release build types to avoid R8 build error D8: com.android.tools.r8.internal.Hc: Unexpected attempt to get register for a value without a register in method `java.lang.String androidx.compose.compiler.plugins.kotlin.lower.IrSourcePrinterKt.dumpSrc(org.jetbrains.kotlin.ir.IrElement, boolean)` --- MultiplatformDemo/androidApp/build.gradle.kts | 2 +- MultiplatformDemoWithSync/androidApp/build.gradle.kts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/MultiplatformDemo/androidApp/build.gradle.kts b/MultiplatformDemo/androidApp/build.gradle.kts index f39a1d0..fe47487 100644 --- a/MultiplatformDemo/androidApp/build.gradle.kts +++ b/MultiplatformDemo/androidApp/build.gradle.kts @@ -29,7 +29,7 @@ android { } buildTypes { getByName("release") { - isMinifyEnabled = false + isMinifyEnabled = true } } diff --git a/MultiplatformDemoWithSync/androidApp/build.gradle.kts b/MultiplatformDemoWithSync/androidApp/build.gradle.kts index d6f3a2a..b1cb26e 100644 --- a/MultiplatformDemoWithSync/androidApp/build.gradle.kts +++ b/MultiplatformDemoWithSync/androidApp/build.gradle.kts @@ -30,7 +30,7 @@ android { } buildTypes { getByName("release") { - isMinifyEnabled = false + isMinifyEnabled = true } } From b7670bd31afcd82de959a278190d89c3c3a23562 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Claus=20R=C3=B8rbech?= Date: Fri, 19 Apr 2024 14:12:24 +0200 Subject: [PATCH 5/5] Remove commented dependency --- MultiplatformDemoWithSync/jvmApp/build.gradle.kts | 1 - 1 file changed, 1 deletion(-) diff --git a/MultiplatformDemoWithSync/jvmApp/build.gradle.kts b/MultiplatformDemoWithSync/jvmApp/build.gradle.kts index 8f820ac..6a8b640 100644 --- a/MultiplatformDemoWithSync/jvmApp/build.gradle.kts +++ b/MultiplatformDemoWithSync/jvmApp/build.gradle.kts @@ -16,7 +16,6 @@ repositories { dependencies { implementation(compose.desktop.currentOs) implementation(project(":shared")) -// implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.8.2") } tasks.withType {