Skip to content

Commit

Permalink
Update to 0.8.2 (#17)
Browse files Browse the repository at this point in the history
  • Loading branch information
nhachicha committed Jan 26, 2022
1 parent fefa735 commit 22f2199
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 46 deletions.
2 changes: 1 addition & 1 deletion Bookshelf/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
kotlin("android")
}

val compose_version = "1.1.0-rc01"
val compose_version = "1.2.0-alpha01"

repositories {
google()
Expand Down
6 changes: 3 additions & 3 deletions Bookshelf/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
classpath("com.android.tools.build:gradle:7.1.0-beta05")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("com.android.tools.build:gradle:7.1.0-rc01")
}
}

Expand All @@ -16,7 +16,7 @@ allprojects {
mavenCentral()
}
group = "io.realm.sample.bookshelf"
version = "0.8.0"
version = "0.8.2"
}

tasks.register("clean", Delete::class) {
Expand Down
4 changes: 2 additions & 2 deletions Bookshelf/iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- shared (0.8.0)
- shared (0.8.2)

DEPENDENCIES:
- shared (from `../shared`)
Expand All @@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../shared"

SPEC CHECKSUMS:
shared: 435401ceb57c44f421fd509682a959ce28f70dd8
shared: fc03e8b4665da5ff6f468a404bc88438bd05931d

PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756

Expand Down
6 changes: 3 additions & 3 deletions Bookshelf/iosApp/Pods/Local Podspecs/shared.podspec.json

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

4 changes: 2 additions & 2 deletions Bookshelf/iosApp/Pods/Manifest.lock

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

4 changes: 2 additions & 2 deletions Bookshelf/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
id("com.android.library")
id("kotlin-android-extensions")
kotlin("plugin.serialization") version "1.5.31"
id("io.realm.kotlin") version "0.8.0"
id("io.realm.kotlin") version "0.8.2"
}

kotlin {
Expand All @@ -30,7 +30,7 @@ kotlin {
val ktorVersion = "1.6.1"
val serializationVersion = "1.2.1"
val coroutinesVersion = "1.5.2-native-mt"
val realmVersion = "0.8.0"
val realmVersion = "0.8.2"

sourceSets {
val commonMain by getting {
Expand Down
2 changes: 1 addition & 1 deletion Bookshelf/shared/shared.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'shared'
spec.version = '0.8.0'
spec.version = '0.8.2'
spec.homepage = 'https://github.com/realm/realm-kotlin'
spec.source = { :git => "Not Published", :tag => "Cocoapods/#{spec.name}/#{spec.version}" }
spec.authors = ''
Expand Down
6 changes: 3 additions & 3 deletions Intro/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
classpath("com.android.tools.build:gradle:7.1.0-beta05")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("com.android.tools.build:gradle:7.1.0-rc01")
}
}
group = "io.realm.example"
version = "0.8.0"
version = "0.8.2"

allprojects {
repositories {
Expand Down
4 changes: 2 additions & 2 deletions Intro/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
plugins {
kotlin("multiplatform")
id("com.android.library")
id("io.realm.kotlin") version "0.8.0"
id("io.realm.kotlin") version "0.8.2"
}

kotlin {
Expand All @@ -37,7 +37,7 @@ kotlin {
sourceSets {
val commonMain by getting {
dependencies {
implementation("io.realm.kotlin:library-base:0.8.0")
implementation("io.realm.kotlin:library-base:0.8.2")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
}
}
Expand Down
8 changes: 4 additions & 4 deletions JVMConsole/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile

plugins {
kotlin("jvm") version "1.6.0"
id("io.realm.kotlin") version "0.8.0"
kotlin("jvm") version "1.6.10"
id("io.realm.kotlin") version "0.8.2"
application
}
group = "io.realm.example"
Expand All @@ -13,7 +13,7 @@ repositories {
}
dependencies {
implementation("com.jakewharton.fliptables:fliptables:1.1.0")
implementation("io.realm.kotlin:library-base:0.8.0")
implementation("io.realm.kotlin:library-base:0.8.2")
testImplementation(kotlin("test-junit"))
}
tasks.withType<KotlinCompile>() {
Expand All @@ -31,4 +31,4 @@ tasks.jar {
from(zipTree(file.absoluteFile))
}
duplicatesStrategy = DuplicatesStrategy.INCLUDE
}
}
5 changes: 2 additions & 3 deletions MultiplatformDemo/androidApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ plugins {
kotlin("android")
}

val compose_version = "1.1.0-rc01"
val compose_version = "1.2.0-alpha01"

dependencies {
implementation(project(":shared"))
Expand Down Expand Up @@ -33,7 +33,6 @@ android {
// Required by Compose
kotlinOptions {
jvmTarget = "11"
freeCompilerArgs += "-Xallow-jvm-ir-dependencies"
}

buildFeatures {
Expand All @@ -43,4 +42,4 @@ android {
composeOptions {
kotlinCompilerExtensionVersion = compose_version
}
}
}
8 changes: 4 additions & 4 deletions MultiplatformDemo/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.0")
classpath("com.android.tools.build:gradle:7.1.0-beta05")
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10")
classpath("com.android.tools.build:gradle:7.1.0-rc01")
}
}

Expand All @@ -16,9 +16,9 @@ allprojects {
mavenCentral()
}
group = "io.realm.sample"
version = "0.8.0"
version = "0.8.2"
}

tasks.register("clean", Delete::class) {
delete(rootProject.buildDir)
}
}
4 changes: 2 additions & 2 deletions MultiplatformDemo/iosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- shared (0.8.0)
- shared (0.8.2)

DEPENDENCIES:
- shared (from `../shared`)
Expand All @@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../shared"

SPEC CHECKSUMS:
shared: 435401ceb57c44f421fd509682a959ce28f70dd8
shared: 301cc26982c65f520be31ee7c59ac94c128069e1

PODFILE CHECKSUM: f282da88f39e69507b0a255187c8a6b644477756

Expand Down
5 changes: 0 additions & 5 deletions MultiplatformDemo/jvmApp/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,6 @@ dependencies {

tasks.withType<KotlinCompile> {
kotlinOptions.jvmTarget = "11"
kotlinOptions.freeCompilerArgs += listOf(
"-P",
// FIXME remove this flag when there's an Android Release that supports 1.6.10 so we can remove this suppress
"plugin:androidx.compose.compiler.plugins.kotlin:suppressKotlinVersionCompatibilityCheck=true"
)
}

application {
Expand Down
4 changes: 2 additions & 2 deletions MultiplatformDemo/macosApp/Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PODS:
- shared (1.0)
- shared (0.8.2)

DEPENDENCIES:
- shared (from `../shared`)
Expand All @@ -9,7 +9,7 @@ EXTERNAL SOURCES:
:path: "../shared"

SPEC CHECKSUMS:
shared: 11463184695b113572ac0077e60cee9c9791894e
shared: 301cc26982c65f520be31ee7c59ac94c128069e1

PODFILE CHECKSUM: f3c0715e2cb2ef94e629cad90792d18c14dead0f

Expand Down
10 changes: 4 additions & 6 deletions MultiplatformDemo/shared/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,9 @@ plugins {
kotlin("multiplatform")
kotlin("native.cocoapods")
id("com.android.library")
id("io.realm.kotlin") version "0.8.0"
id("io.realm.kotlin") version "0.8.2"
}

apply(plugin = "io.realm.kotlin")

kotlin {
android()

Expand All @@ -33,12 +31,12 @@ kotlin {
osx.deploymentTarget = "11.0"
frameworkName = "shared"
}

sourceSets {
val commonMain by getting {
dependencies {
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2-native-mt")
implementation("io.realm.kotlin:library-base:0.8.0")
implementation("io.realm.kotlin:library-base:0.8.2")
}
}
val commonTest by getting {
Expand Down Expand Up @@ -72,4 +70,4 @@ android {
minSdk = 21
targetSdk = 30
}
}
}
2 changes: 1 addition & 1 deletion MultiplatformDemo/shared/shared.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |spec|
spec.name = 'shared'
spec.version = '0.8.0'
spec.version = '0.8.2'
spec.homepage = 'https://github.com/realm/realm-kotlin'
spec.source = { :git => "Not Published", :tag => "Cocoapods/#{spec.name}/#{spec.version}" }
spec.authors = ''
Expand Down

0 comments on commit 22f2199

Please sign in to comment.