Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Upgrade samples to use Realm Kotlin 1.15.0 #47

Merged
merged 5 commits into from
Apr 19, 2024
Merged

Upgrade samples to use Realm Kotlin 1.15.0 #47

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
46c6989
Upgrade samples to use Realm Kotlin 1.15.0
rorbech Apr 18, 2024
90fee82
Remove compile options
rorbech Apr 18, 2024
88ae740
Match compose compiler with updated Kotlin version
rorbech Apr 18, 2024
a3c163e
Enable minifying on release build types to avoid R8 build error
rorbech Apr 18, 2024
b7670bd
Remove commented dependency
rorbech Apr 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Bookshelf/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
6 changes: 3 additions & 3 deletions Bookshelf/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand All @@ -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"
Expand Down
72 changes: 37 additions & 35 deletions Bookshelf/iosApp/Pods/Pods.xcodeproj/project.pbxproj
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Bookshelf/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.debug.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Bookshelf/iosApp/Pods/Target Support Files/Pods-iosApp/Pods-iosApp.release.xcconfig
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 18 additions & 0 deletions Bookshelf/iosApp/iosApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
7555FF77242A565900829871 /* Sources */,
7555FF79242A565900829871 /* Resources */,
32057199A02BE64AEB9F6BA2 /* Frameworks */,
EAEE7756A503E98FBD25F933 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -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 */
Expand Down
4 changes: 2 additions & 2 deletions Bookshelf/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}

Expand Down Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions Intro/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand All @@ -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"
2 changes: 0 additions & 2 deletions Intro/gradle.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion Intro/shared/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down
6 changes: 3 additions & 3 deletions JVMConsole/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand Down
4 changes: 2 additions & 2 deletions JavaKotlinMavenInterop/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
14 changes: 9 additions & 5 deletions MultiplatformDemo/androidApp/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"))
Expand All @@ -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
Expand All @@ -29,7 +29,7 @@ android {
}
buildTypes {
getByName("release") {
isMinifyEnabled = false
isMinifyEnabled = true
}
}

Expand All @@ -45,4 +45,8 @@ android {
composeOptions {
kotlinCompilerExtensionVersion = compose_compiler_version
}
compileOptions {
sourceCompatibility = JavaVersion.VERSION_11
targetCompatibility = JavaVersion.VERSION_11
}
}
6 changes: 3 additions & 3 deletions MultiplatformDemo/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
}

Expand All @@ -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"
Expand Down
18 changes: 18 additions & 0 deletions MultiplatformDemo/iosApp/iosApp.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@
832C51992707A71D0086207A /* Sources */,
832C519A2707A71D0086207A /* Frameworks */,
832C519B2707A71D0086207A /* Resources */,
68B02319287E41C0AE1AE700 /* [CP] Embed Pods Frameworks */,
);
buildRules = (
);
Expand Down Expand Up @@ -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;
Expand Down
Loading
Loading