Skip to content

Commit b9b8ca7

Browse files
committed
#12 update kotlin, coroutines
1 parent aefbed9 commit b9b8ca7

File tree

6 files changed

+24
-21
lines changed

6 files changed

+24
-21
lines changed

README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
![moko-mvvm](https://user-images.githubusercontent.com/5010169/71337878-0e0d0f80-2580-11ea-8ac5-69a132334960.png)
2-
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://api.bintray.com/packages/icerockdev/moko/moko-geo/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-geo/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.0-orange)
2+
[![GitHub license](https://img.shields.io/badge/license-Apache%20License%202.0-blue.svg?style=flat)](http://www.apache.org/licenses/LICENSE-2.0) [![Download](https://api.bintray.com/packages/icerockdev/moko/moko-geo/images/download.svg) ](https://bintray.com/icerockdev/moko/moko-geo/_latestVersion) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.21-orange)
33

44
# Mobile Kotlin geolocation module
55
This is a Kotlin Multiplatform library that provides geolocation to common code.
@@ -31,6 +31,8 @@ This is a Kotlin Multiplatform library that provides geolocation to common code.
3131
- 0.2.0
3232
- kotlin 1.4.0
3333
- 0.3.0
34+
- kotlin 1.4.21
35+
- 0.3.1
3436

3537
## Installation
3638
root build.gradle
@@ -45,7 +47,7 @@ allprojects {
4547
project build.gradle
4648
```groovy
4749
dependencies {
48-
commonMainApi("dev.icerock.moko:geo:0.3.0")
50+
commonMainApi("dev.icerock.moko:geo:0.3.1")
4951
androidMainImplementation("com.google.android.gms:play-services-location:17.0.0")
5052
}
5153
```

buildSrc/build.gradle.kts

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,18 @@
33
*/
44

55
plugins {
6-
id("org.jetbrains.kotlin.jvm") version("1.4.0")
6+
id("org.jetbrains.kotlin.jvm") version("1.4.21")
77
}
88

99
repositories {
10-
mavenLocal()
11-
1210
jcenter()
1311
google()
1412

1513
maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
1614
}
1715

1816
dependencies {
19-
implementation("dev.icerock:mobile-multiplatform:0.7.0")
20-
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
17+
implementation("dev.icerock:mobile-multiplatform:0.9.0")
18+
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
2119
implementation("com.android.tools.build:gradle:4.0.1")
2220
}

buildSrc/src/main/kotlin/Deps.kt

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
object Deps {
2-
private const val kotlinVersion = "1.4.0"
2+
private const val kotlinVersion = "1.4.21"
33

44
private const val androidAppCompatVersion = "1.1.0"
55
private const val materialDesignVersion = "1.0.0"
@@ -9,11 +9,11 @@ object Deps {
99

1010
private const val detektVersion = "1.7.4"
1111

12-
private const val coroutinesVersion = "1.3.9"
13-
private const val mokoParcelizeVersion = "0.4.0"
12+
private const val coroutinesVersion = "1.4.2"
13+
private const val mokoParcelizeVersion = "0.5.0"
1414
private const val mokoPermissionsVersion = "0.6.0"
15-
private const val mokoMvvmVersion = "0.8.0"
16-
const val mokoGeoVersion = "0.3.0"
15+
private const val mokoMvvmVersion = "0.8.1"
16+
const val mokoGeoVersion = "0.3.1"
1717

1818
object Android {
1919
const val compileSdk = 28
@@ -56,11 +56,8 @@ object Deps {
5656
const val coroutines =
5757
"org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
5858
const val mokoParcelize = "dev.icerock.moko:parcelize:$mokoParcelizeVersion"
59-
val mokoPermissions = MultiPlatformLibrary(
60-
common = "dev.icerock.moko:permissions:$mokoPermissionsVersion",
61-
iosX64 = "dev.icerock.moko:permissions-iosx64:$mokoPermissionsVersion",
62-
iosArm64 = "dev.icerock.moko:permissions-iosarm64:$mokoPermissionsVersion"
63-
)
59+
val mokoPermissions = "dev.icerock.moko:permissions:$mokoPermissionsVersion"
60+
.defaultMPL(ios = true)
6461
const val mokoMvvm = "dev.icerock.moko:mvvm:$mokoMvvmVersion"
6562
const val mokoGeo = "dev.icerock.moko:geo:$mokoGeoVersion"
6663
}

geo/src/iosMain/kotlin/dev/icerock/moko/geo/UIDispatcher.kt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,11 @@ internal class UIDispatcher : CoroutineDispatcher(), Delay {
4747
}
4848
}
4949

50-
override fun invokeOnTimeout(timeMillis: Long, block: Runnable): DisposableHandle {
50+
override fun invokeOnTimeout(
51+
timeMillis: Long,
52+
block: Runnable,
53+
context: CoroutineContext
54+
): DisposableHandle {
5155
var disposed = false
5256
dispatch_after(
5357
`when` = dispatch_time(
@@ -66,4 +70,4 @@ internal class UIDispatcher : CoroutineDispatcher(), Delay {
6670
}
6771
}
6872
}
69-
}
73+
}

sample/ios-app/Podfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
1313

1414
PODFILE CHECKSUM: 1b71d80cc7f81711555670bda957555a8503b31a
1515

16-
COCOAPODS: 1.9.3
16+
COCOAPODS: 1.10.0

sample/ios-app/TestProj.xcodeproj/project.pbxproj

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
archiveVersion = 1;
44
classes = {
55
};
6-
objectVersion = 50;
6+
objectVersion = 51;
77
objects = {
88

99
/* Begin PBXBuildFile section */
@@ -249,6 +249,7 @@
249249
buildSettings = {
250250
CURRENT_PROJECT_VERSION = 0;
251251
DEFINES_MODULE = YES;
252+
ONLY_ACTIVE_ARCH = YES;
252253
SWIFT_VERSION = 4.0;
253254
};
254255
name = Debug;
@@ -258,6 +259,7 @@
258259
buildSettings = {
259260
CURRENT_PROJECT_VERSION = 0;
260261
DEFINES_MODULE = YES;
262+
ONLY_ACTIVE_ARCH = YES;
261263
SWIFT_VERSION = 4.0;
262264
};
263265
name = Release;

0 commit comments

Comments
 (0)