Merge pull request #13 from icerockdev/develop

Release 0.3.1

Author: Alex009

README.md

@@ -1,5 +1,5 @@
 ![moko-mvvm](https://user-images.githubusercontent.com/5010169/71337878-0e0d0f80-2580-11ea-8ac5-69a132334960.png)  
-[![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)
+[![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)
 
 # Mobile Kotlin geolocation module
 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.
   - 0.2.0
 - kotlin 1.4.0
   - 0.3.0
+- kotlin 1.4.21
+  - 0.3.1
 
 ## Installation
 root build.gradle  
@@ -45,7 +47,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:geo:0.3.0")
+    commonMainApi("dev.icerock.moko:geo:0.3.1")
     androidMainImplementation("com.google.android.gms:play-services-location:17.0.0")
 }
 ```

buildSrc/build.gradle.kts

@@ -3,20 +3,18 @@
  */
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version("1.4.0")
+    id("org.jetbrains.kotlin.jvm") version("1.4.21")
 }
 
 repositories {
-    mavenLocal()
-
     jcenter()
     google()
 
     maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.7.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
+    implementation("dev.icerock:mobile-multiplatform:0.9.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21")
     implementation("com.android.tools.build:gradle:4.0.1")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -1,5 +1,5 @@
 object Deps {
-    private const val kotlinVersion = "1.4.0"
+    private const val kotlinVersion = "1.4.21"
 
     private const val androidAppCompatVersion = "1.1.0"
     private const val materialDesignVersion = "1.0.0"
@@ -9,11 +9,11 @@ object Deps {
 
     private const val detektVersion = "1.7.4"
 
-    private const val coroutinesVersion = "1.3.9"
-    private const val mokoParcelizeVersion = "0.4.0"
+    private const val coroutinesVersion = "1.4.2"
+    private const val mokoParcelizeVersion = "0.5.0"
     private const val mokoPermissionsVersion = "0.6.0"
-    private const val mokoMvvmVersion = "0.8.0"
-    const val mokoGeoVersion = "0.3.0"
+    private const val mokoMvvmVersion = "0.8.1"
+    const val mokoGeoVersion = "0.3.1"
 
     object Android {
         const val compileSdk = 28
@@ -56,11 +56,8 @@ object Deps {
             const val coroutines =
                 "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutinesVersion"
             const val mokoParcelize = "dev.icerock.moko:parcelize:$mokoParcelizeVersion"
-            val mokoPermissions = MultiPlatformLibrary(
-                common = "dev.icerock.moko:permissions:$mokoPermissionsVersion",
-                iosX64 = "dev.icerock.moko:permissions-iosx64:$mokoPermissionsVersion",
-                iosArm64 = "dev.icerock.moko:permissions-iosarm64:$mokoPermissionsVersion"
-            )
+            val mokoPermissions = "dev.icerock.moko:permissions:$mokoPermissionsVersion"
+                .defaultMPL(ios = true)
             const val mokoMvvm = "dev.icerock.moko:mvvm:$mokoMvvmVersion"
             const val mokoGeo = "dev.icerock.moko:geo:$mokoGeoVersion"
         }

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

@@ -47,7 +47,11 @@ internal class UIDispatcher : CoroutineDispatcher(), Delay {
         }
     }
 
-    override fun invokeOnTimeout(timeMillis: Long, block: Runnable): DisposableHandle {
+    override fun invokeOnTimeout(
+        timeMillis: Long,
+        block: Runnable,
+        context: CoroutineContext
+    ): DisposableHandle {
         var disposed = false
         dispatch_after(
             `when` = dispatch_time(
@@ -66,4 +70,4 @@ internal class UIDispatcher : CoroutineDispatcher(), Delay {
             }
         }
     }
-}
+}

sample/ios-app/Podfile.lock

@@ -13,4 +13,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 1b71d80cc7f81711555670bda957555a8503b31a
 
-COCOAPODS: 1.9.3
+COCOAPODS: 1.10.0

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

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -249,6 +249,7 @@
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 0;
 				DEFINES_MODULE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Debug;
@@ -258,6 +259,7 @@
 			buildSettings = {
 				CURRENT_PROJECT_VERSION = 0;
 				DEFINES_MODULE = YES;
+				ONLY_ACTIVE_ARCH = YES;
 				SWIFT_VERSION = 4.0;
 			};
 			name = Release;