Merge pull request #10 from icerockdev/develop

Release 0.3.0

Author: Alex009

.github/workflows/compilation-check.yml

@@ -17,4 +17,4 @@ jobs:
       with:
         java-version: 1.8
     - name: Check build
-      run: ./gradlew -PlibraryPublish :geo:publishToMavenLocal
+      run: ./gradlew build publishToMavenLocal

.github/workflows/publish.yml

@@ -15,4 +15,4 @@ jobs:
         with:
           java-version: 1.8
       - name: Publish
-        run: ./gradlew -PlibraryPublish :geo:publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}

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.3.70-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.0-orange)
 
 # Mobile Kotlin geolocation module
 This is a Kotlin Multiplatform library that provides geolocation to common code.
@@ -11,15 +11,15 @@ This is a Kotlin Multiplatform library that provides geolocation to common code.
 - [Installation](#installation)
 - [Usage](#usage)
 - [Samples](#samples)
-- [Set Up Locally](#setup-locally)
+- [Set Up Locally](#set-up-locally)
 - [Contributing](#contributing)
 - [License](#license)
 
 ## Features
 - **Geolocation tracking** - track user geolocation from common code;
 
 ## Requirements
-- Gradle version 5.6.4+
+- Gradle version 6.0+
 - Android API 16+
 - iOS version 9.0+
 
@@ -29,6 +29,8 @@ This is a Kotlin Multiplatform library that provides geolocation to common code.
   - 0.1.1
 - kotlin 1.3.70
   - 0.2.0
+- kotlin 1.4.0
+  - 0.3.0
 
 ## Installation
 root build.gradle  
@@ -43,7 +45,7 @@ allprojects {
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:geo:0.2.0")
+    commonMainApi("dev.icerock.moko:geo:0.3.0")
     androidMainImplementation("com.google.android.gms:play-services-location:17.0.0")
 }
 ```
@@ -100,8 +102,7 @@ Please see more examples in the [sample directory](sample).
 
 ## Set Up Locally 
 - The [geo directory](geo) contains the `geo` library;
-- In [sample directory](sample) contains sample apps for Android and iOS; plus the mpp-library connected to the apps;
-- For local testing use the `./publishToMavenLocal.sh` script - so that sample apps use the locally published version.
+- In [sample directory](sample) contains sample apps for Android and iOS; plus the mpp-library connected to the apps.
 
 ## Contributing
 All development (both new features and bug fixes) is performed in the `develop` branch. This way `master` always contains the sources of the most recently released version. Please send PRs with bug fixes to the `develop` branch. Documentation fixes in the markdown files are an exception to this rule. They are updated directly in `master`.

build.gradle.kts

@@ -4,8 +4,6 @@
 
 allprojects {
     repositories {
-        mavenLocal()
-
         google()
         jcenter()
 
@@ -14,8 +12,16 @@ allprojects {
         maven { url = uri("https://dl.bintray.com/icerockdev/moko") }
     }
 
-    // workaround for https://youtrack.jetbrains.com/issue/KT-27170
-    configurations.create("compileClasspath")
+    plugins.withId(Deps.Plugins.androidLibrary.id) {
+        configure<com.android.build.gradle.LibraryExtension> {
+            compileSdkVersion(Deps.Android.compileSdk)
+
+            defaultConfig {
+                minSdkVersion(Deps.Android.minSdk)
+                targetSdkVersion(Deps.Android.targetSdk)
+            }
+        }
+    }
 }
 
 tasks.register("clean", Delete::class).configure {

buildSrc/build.gradle.kts

@@ -3,7 +3,7 @@
  */
 
 plugins {
-    `kotlin-dsl`
+    id("org.jetbrains.kotlin.jvm") version("1.4.0")
 }
 
 repositories {
@@ -16,11 +16,7 @@ repositories {
 }
 
 dependencies {
-    implementation("dev.icerock:mobile-multiplatform:0.6.0")
-    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.70")
-    implementation("com.android.tools.build:gradle:3.6.1")
-}
-
-kotlinDslPluginOptions {
-    experimentalWarning.set(false)
+    implementation("dev.icerock:mobile-multiplatform:0.7.0")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.0")
+    implementation("com.android.tools.build:gradle:4.0.1")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -1,53 +1,75 @@
 object Deps {
+    private const val kotlinVersion = "1.4.0"
+
+    private const val androidAppCompatVersion = "1.1.0"
+    private const val materialDesignVersion = "1.0.0"
+    private const val androidLifecycleVersion = "2.1.0"
+    private const val androidCoreTestingVersion = "2.1.0"
+    private const val playServicesLocationVersion = "16.0.0"
+
+    private const val detektVersion = "1.7.4"
+
+    private const val coroutinesVersion = "1.3.9"
+    private const val mokoParcelizeVersion = "0.4.0"
+    private const val mokoPermissionsVersion = "0.6.0"
+    private const val mokoMvvmVersion = "0.8.0"
+    const val mokoGeoVersion = "0.3.0"
+
+    object Android {
+        const val compileSdk = 28
+        const val targetSdk = 28
+        const val minSdk = 16
+    }
+
+    object Plugins {
+        val androidApplication = GradlePlugin(id = "com.android.application")
+        val androidLibrary = GradlePlugin(id = "com.android.library")
+        val kotlinJvm = GradlePlugin(id = "org.jetbrains.kotlin.jvm")
+        val kotlinMultiplatform = GradlePlugin(id = "org.jetbrains.kotlin.multiplatform")
+        val kotlinKapt = GradlePlugin(id = "kotlin-kapt")
+        val kotlinAndroid = GradlePlugin(id = "kotlin-android")
+        val kotlinAndroidExtensions = GradlePlugin(id = "kotlin-android-extensions")
+        val kotlinSerialization = GradlePlugin(id = "kotlin-serialization")
+        val mavenPublish = GradlePlugin(id = "org.gradle.maven-publish")
+
+        val mobileMultiplatform = GradlePlugin(id = "dev.icerock.mobile.multiplatform")
+        val iosFramework = GradlePlugin(id = "dev.icerock.mobile.multiplatform.ios-framework")
+
+        val detekt = GradlePlugin(
+            id = "io.gitlab.arturbosch.detekt",
+            version = detektVersion
+        )
+    }
+
     object Libs {
         object Android {
-            val kotlinStdLib = AndroidLibrary(
-                name = "org.jetbrains.kotlin:kotlin-stdlib:${Versions.kotlin}"
-            )
-            val appCompat = AndroidLibrary(
-                name = "androidx.appcompat:appcompat:${Versions.Libs.Android.appCompat}"
-            )
-            val material = AndroidLibrary(
-                name = "com.google.android.material:material:${Versions.Libs.Android.material}"
-            )
-            val lifecycle = AndroidLibrary(
-                name = "androidx.lifecycle:lifecycle-extensions:${Versions.Libs.Android.lifecycle}"
-            )
-            val playServicesLocation = AndroidLibrary(
-                name = "com.google.android.gms:play-services-location:${Versions.Libs.Android.playServicesLocation}"
-            )
+            const val appCompat = "androidx.appcompat:appcompat:$androidAppCompatVersion"
+            const val material = "com.google.android.material:material:$materialDesignVersion"
+            const val lifecycle = "androidx.lifecycle:lifecycle-extensions:$androidLifecycleVersion"
+            const val coroutines =
+                "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesVersion"
+            const val playServicesLocation =
+                "com.google.android.gms:play-services-location:$playServicesLocationVersion"
         }
 
         object MultiPlatform {
-            val kotlinStdLib = MultiPlatformLibrary(
-                android = Android.kotlinStdLib.name,
-                common = "org.jetbrains.kotlin:kotlin-stdlib-common:${Versions.kotlin}"
-            )
-            val coroutines = MultiPlatformLibrary(
-                android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:${Versions.Libs.MultiPlatform.coroutines}",
-                common = "org.jetbrains.kotlinx:kotlinx-coroutines-core-common:${Versions.Libs.MultiPlatform.coroutines}",
-                ios = "org.jetbrains.kotlinx:kotlinx-coroutines-core-native:${Versions.Libs.MultiPlatform.coroutines}"
-            )
-            val mokoGeo = MultiPlatformLibrary(
-                common = "dev.icerock.moko:geo:${Versions.Libs.MultiPlatform.mokoGeo}",
-                iosX64 = "dev.icerock.moko:geo-iosx64:${Versions.Libs.MultiPlatform.mokoGeo}",
-                iosArm64 = "dev.icerock.moko:geo-iosarm64:${Versions.Libs.MultiPlatform.mokoGeo}"
-            )
-            val mokoParcelize = MultiPlatformLibrary(
-                common = "dev.icerock.moko:parcelize:${Versions.Libs.MultiPlatform.mokoParcelize}",
-                iosX64 = "dev.icerock.moko:parcelize-iosx64:${Versions.Libs.MultiPlatform.mokoParcelize}",
-                iosArm64 = "dev.icerock.moko:parcelize-iosarm64:${Versions.Libs.MultiPlatform.mokoParcelize}"
-            )
+            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:${Versions.Libs.MultiPlatform.mokoPermissions}",
-                iosX64 = "dev.icerock.moko:permissions-iosx64:${Versions.Libs.MultiPlatform.mokoPermissions}",
-                iosArm64 = "dev.icerock.moko:permissions-iosarm64:${Versions.Libs.MultiPlatform.mokoPermissions}"
-            )
-            val mokoMvvm = MultiPlatformLibrary(
-                common = "dev.icerock.moko:mvvm:${Versions.Libs.MultiPlatform.mokoMvvm}",
-                iosX64 = "dev.icerock.moko:mvvm-iosx64:${Versions.Libs.MultiPlatform.mokoMvvm}",
-                iosArm64 = "dev.icerock.moko:mvvm-iosarm64:${Versions.Libs.MultiPlatform.mokoMvvm}"
+                common = "dev.icerock.moko:permissions:$mokoPermissionsVersion",
+                iosX64 = "dev.icerock.moko:permissions-iosx64:$mokoPermissionsVersion",
+                iosArm64 = "dev.icerock.moko:permissions-iosarm64:$mokoPermissionsVersion"
             )
+            const val mokoMvvm = "dev.icerock.moko:mvvm:$mokoMvvmVersion"
+            const val mokoGeo = "dev.icerock.moko:geo:$mokoGeoVersion"
+        }
+
+        object Tests {
+            const val kotlinTestJUnit =
+                "org.jetbrains.kotlin:kotlin-test-junit:$kotlinVersion"
+            const val androidCoreTesting =
+                "androidx.arch.core:core-testing:$androidCoreTestingVersion"
         }
     }
-}
+}

buildSrc/src/main/kotlin/Versions.kt

@@ -3,36 +3,26 @@
  */
 
 plugins {
-    id("com.android.library")
-    id("org.jetbrains.kotlin.multiplatform")
-    id("kotlin-kapt")
-    id("kotlin-android-extensions")
-    id("dev.icerock.mobile.multiplatform")
-    id("maven-publish")
+    plugin(Deps.Plugins.androidLibrary)
+    plugin(Deps.Plugins.kotlinMultiplatform)
+    plugin(Deps.Plugins.kotlinKapt)
+    plugin(Deps.Plugins.kotlinAndroidExtensions)
+    plugin(Deps.Plugins.mobileMultiplatform)
+    plugin(Deps.Plugins.mavenPublish)
 }
 
 group = "dev.icerock.moko"
-version = Versions.Libs.MultiPlatform.mokoGeo
-
-android {
-    compileSdkVersion(Versions.Android.compileSdk)
-
-    defaultConfig {
-        minSdkVersion(Versions.Android.minSdk)
-        targetSdkVersion(Versions.Android.targetSdk)
-    }
-}
+version = Deps.mokoGeoVersion
 
 dependencies {
-    mppLibrary(Deps.Libs.MultiPlatform.kotlinStdLib)
-    mppLibrary(Deps.Libs.MultiPlatform.coroutines)
+    commonMainImplementation(Deps.Libs.MultiPlatform.coroutines)
 
-    mppLibrary(Deps.Libs.MultiPlatform.mokoParcelize)
-    mppLibrary(Deps.Libs.MultiPlatform.mokoPermissions)
+    commonMainImplementation(Deps.Libs.MultiPlatform.mokoParcelize)
+    commonMainImplementation(Deps.Libs.MultiPlatform.mokoPermissions.common)
 
-    androidLibrary(Deps.Libs.Android.appCompat)
-    androidLibrary(Deps.Libs.Android.lifecycle)
-    androidLibrary(Deps.Libs.Android.playServicesLocation)
+    androidMainImplementation(Deps.Libs.Android.appCompat)
+    androidMainImplementation(Deps.Libs.Android.lifecycle)
+    androidMainImplementation(Deps.Libs.Android.playServicesLocation)
 }
 
 publishing {

geo/build.gradle.kts

@@ -1 +1 @@
-iosMain
+iosX64Main

geo/src/iosArm64Main

@@ -6,35 +6,31 @@ package dev.icerock.moko.geo
 
 import dev.icerock.moko.permissions.Permission
 import dev.icerock.moko.permissions.PermissionsController
-import kotlinx.cinterop.useContents
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.channels.Channel
 import kotlinx.coroutines.channels.awaitClose
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.channelFlow
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import platform.CoreLocation.CLLocation
 import platform.CoreLocation.CLLocationAccuracy
 import platform.CoreLocation.CLLocationManager
-import platform.CoreLocation.CLLocationManagerDelegateProtocol
 import platform.CoreLocation.kCLLocationAccuracyBest
-import platform.Foundation.NSError
-import platform.Foundation.NSLog
-import platform.darwin.NSObject
-import kotlin.native.ref.WeakReference
 
 actual class LocationTracker(
     actual val permissionsController: PermissionsController,
     accuracy: CLLocationAccuracy = kCLLocationAccuracyBest
 ) {
-    private val tracker = Tracker(this)
+    private val locationsChannel = Channel<LatLng>(Channel.BUFFERED)
+    private val trackerScope = CoroutineScope(UIDispatcher())
+    private val tracker = Tracker(
+        locationsChannel = locationsChannel,
+        scope = trackerScope
+    )
     private val locationManager = CLLocationManager().apply {
         delegate = tracker
         desiredAccuracy = accuracy
     }
-    private val locationsChannel = Channel<LatLng>(Channel.BUFFERED)
-    private val trackerScope = CoroutineScope(UIDispatcher())
 
     actual suspend fun startTracking() {
         permissionsController.providePermission(Permission.LOCATION)
@@ -60,32 +56,4 @@ actual class LocationTracker(
             awaitClose { job.cancel() }
         }
     }
-
-    private class Tracker(
-        locationTracker: LocationTracker
-    ) : NSObject(), CLLocationManagerDelegateProtocol {
-        private val locationTracker = WeakReference(locationTracker)
-
-        override fun locationManager(manager: CLLocationManager, didUpdateLocations: List<*>) {
-            val locations = didUpdateLocations as List<CLLocation>
-            val locationTracker = locationTracker.get() ?: return
-            val trackerScope = locationTracker.trackerScope
-            val locationsChannel = locationTracker.locationsChannel
-
-            locations.forEach { location ->
-                val latLng = location.coordinate().useContents {
-                    LatLng(
-                        latitude = latitude,
-                        longitude = longitude
-                    )
-                }
-                trackerScope.launch { locationsChannel.send(latLng) }
-            }
-        }
-
-        override fun locationManager(manager: CLLocationManager, didFailWithError: NSError) {
-            NSLog("$this fail with $didFailWithError")
-        }
-    }
 }
-