Merge pull request #20 from icerockdev/develop

Release 0.3.2

Author: Alex009

.github/workflows/compilation-check.yml

@@ -3,18 +3,22 @@ name: KMP library compilation check
 on:
   pull_request:
     branches:
-    - master
-    - develop
+      - master
+      - develop
 
 jobs:
-  build:
+  test:
     runs-on: macOS-latest
 
     steps:
-    - uses: actions/checkout@v1
-    - name: Set up JDK 1.8
-      uses: actions/setup-java@v1
-      with:
-        java-version: 1.8
-    - name: Check build
-      run: ./gradlew build publishToMavenLocal
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Check runtime
+        run: ./gradlew build publishToMavenLocal syncMultiPlatformLibraryDebugFrameworkIosX64
+      - name: Install pods
+        run: cd sample/ios-app && pod install
+      - name: build ios sample
+        run: cd sample/ios-app && xcodebuild -scheme TestProj -workspace TestProj.xcworkspace -configuration Debug build CODE_SIGNING_REQUIRED=NO CODE_SIGNING_ALLOWED=NO

.github/workflows/publish.yml

@@ -1,18 +1,44 @@
-name: KMP library publish
+name: Create release
 
 on:
-  release:
-    types: [published]
+  workflow_dispatch:
+    inputs:
+      version:
+        description: 'Version'
+        default: '0.1.0'
+        required: true
 
 jobs:
-  build:
-    runs-on: macOS-latest
-
+  publish:
+    name: Publish library at mavenCentral
+    runs-on: macos-latest
+    env:
+      OSSRH_USER: ${{ secrets.OSSRH_USER }}
+      OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
+      SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
+      SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
+      SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
     steps:
       - uses: actions/checkout@v1
       - name: Set up JDK 1.8
         uses: actions/setup-java@v1
         with:
           java-version: 1.8
       - name: Publish
-        run: ./gradlew publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew publish
+  release:
+    name: Create release
+    needs: publish
+    runs-on: ubuntu-latest
+    steps:
+      - name: Create Release
+        id: create_release
+        uses: actions/create-release@v1
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          commitish: ${{ github.ref }}
+          tag_name: release/${{ github.event.inputs.version }}
+          release_name: Release ${{ github.event.inputs.version }}
+          body: "Will be filled later"
+          draft: true

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.21-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://img.shields.io/maven-central/v/dev.icerock.moko/geo) ](https://repo1.maven.org/maven2/dev/icerock/moko/geo) ![kotlin-version](https://img.shields.io/badge/kotlin-1.4.31-orange)
 
 # Mobile Kotlin geolocation module
 This is a Kotlin Multiplatform library that provides geolocation to common code.
@@ -24,6 +24,7 @@ This is a Kotlin Multiplatform library that provides geolocation to common code.
 - iOS version 9.0+
 
 ## Versions
+### Bintray
 - kotlin 1.3.61
   - 0.1.0
   - 0.1.1
@@ -33,22 +34,25 @@ This is a Kotlin Multiplatform library that provides geolocation to common code.
   - 0.3.0
 - kotlin 1.4.21
   - 0.3.1
+### mavenCentral
+- kotlin 1.4.31
+  - 0.3.2
 
 ## Installation
 root build.gradle  
 ```groovy
 allprojects {
     repositories {
-        maven { url = "https://dl.bintray.com/icerockdev/moko" }
+        mavenCentral()
     }
 }
 ```
 
 project build.gradle
 ```groovy
 dependencies {
-    commonMainApi("dev.icerock.moko:geo:0.3.1")
-    androidMainImplementation("com.google.android.gms:play-services-location:17.0.0")
+    commonMainApi("dev.icerock.moko:geo:0.3.2")
+    androidMainImplementation("com.google.android.gms:play-services-location:18.0.0")
 }
 ```
 

build.gradle.kts

@@ -4,12 +4,15 @@
 
 allprojects {
     repositories {
+        mavenCentral()
         google()
-        jcenter()
 
-        maven { url = uri("https://kotlin.bintray.com/kotlin") }
-        maven { url = uri("https://kotlin.bintray.com/kotlinx") }
-        maven { url = uri("https://dl.bintray.com/icerockdev/moko") }
+        jcenter {
+            content {
+                includeGroup("org.jetbrains.trove4j")
+                includeGroup("org.jetbrains.kotlinx")
+            }
+        }
     }
 
     plugins.withId(Deps.Plugins.androidLibrary.id) {

buildSrc/build.gradle.kts

@@ -3,18 +3,22 @@
  */
 
 plugins {
-    id("org.jetbrains.kotlin.jvm") version("1.4.21")
+    id("org.jetbrains.kotlin.jvm") version("1.4.31")
 }
 
 repositories {
-    jcenter()
+    mavenCentral()
     google()
 
-    maven { url = uri("https://dl.bintray.com/icerockdev/plugins") }
+    jcenter {
+        content {
+            includeGroup("org.jetbrains.trove4j")
+        }
+    }
 }
 
 dependencies {
-    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")
+    implementation("dev.icerock:mobile-multiplatform:0.9.1")
+    implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.31")
+    implementation("com.android.tools.build:gradle:4.1.1")
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -1,19 +1,19 @@
 object Deps {
-    private const val kotlinVersion = "1.4.21"
+    private const val kotlinVersion = "1.4.31"
 
     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 playServicesLocationVersion = "18.0.0"
 
-    private const val detektVersion = "1.7.4"
+    private const val detektVersion = "1.15.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.1"
-    const val mokoGeoVersion = "0.3.1"
+    private const val mokoParcelizeVersion = "0.6.1"
+    private const val mokoPermissionsVersion = "0.8.0"
+    private const val mokoMvvmVersion = "0.9.2"
+    const val mokoGeoVersion = "0.3.2"
 
     object Android {
         const val compileSdk = 28
@@ -31,6 +31,7 @@ object Deps {
         val kotlinAndroidExtensions = GradlePlugin(id = "kotlin-android-extensions")
         val kotlinSerialization = GradlePlugin(id = "kotlin-serialization")
         val mavenPublish = GradlePlugin(id = "org.gradle.maven-publish")
+        val signing = GradlePlugin(id = "signing")
 
         val mobileMultiplatform = GradlePlugin(id = "dev.icerock.mobile.multiplatform")
         val iosFramework = GradlePlugin(id = "dev.icerock.mobile.multiplatform.ios-framework")

geo/build.gradle.kts

@@ -2,13 +2,16 @@
  * Copyright 2019 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
  */
 
+import java.util.Base64
+
 plugins {
     plugin(Deps.Plugins.androidLibrary)
     plugin(Deps.Plugins.kotlinMultiplatform)
     plugin(Deps.Plugins.kotlinKapt)
     plugin(Deps.Plugins.kotlinAndroidExtensions)
     plugin(Deps.Plugins.mobileMultiplatform)
     plugin(Deps.Plugins.mavenPublish)
+    plugin(Deps.Plugins.signing)
 }
 
 group = "dev.icerock.moko"
@@ -25,13 +28,60 @@ dependencies {
     androidMainImplementation(Deps.Libs.Android.playServicesLocation)
 }
 
+val javadocJar by tasks.registering(Jar::class) {
+    archiveClassifier.set("javadoc")
+}
+
 publishing {
-    repositories.maven("https://api.bintray.com/maven/icerockdev/moko/moko-geo/;publish=1") {
-        name = "bintray"
+    repositories.maven("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
+        name = "OSSRH"
 
         credentials {
-            username = System.getProperty("BINTRAY_USER")
-            password = System.getProperty("BINTRAY_KEY")
+            username = System.getenv("OSSRH_USER")
+            password = System.getenv("OSSRH_KEY")
+        }
+    }
+
+    publications.withType<MavenPublication> {
+        // Stub javadoc.jar artifact
+        artifact(javadocJar.get())
+
+        // Provide artifacts information requited by Maven Central
+        pom {
+            name.set("MOKO geo")
+            description.set("Geolocation access for mobile (android & ios) Kotlin Multiplatform development")
+            url.set("https://github.com/icerockdev/moko-geo")
+            licenses {
+                license {
+                    url.set("https://github.com/icerockdev/moko-geo/blob/master/LICENSE.md")
+                }
+            }
+
+            developers {
+                developer {
+                    id.set("Alex009")
+                    name.set("Aleksey Mikhailov")
+                    email.set("aleksey.mikhailov@icerockdev.com")
+                }
+            }
+
+            scm {
+                connection.set("scm:git:ssh://github.com/icerockdev/moko-geo.git")
+                developerConnection.set("scm:git:ssh://github.com/icerockdev/moko-geo.git")
+                url.set("https://github.com/icerockdev/moko-geo")
+            }
         }
     }
-}
+}
+
+signing {
+    val signingKeyId: String? = System.getenv("SIGNING_KEY_ID")
+    val signingPassword: String? = System.getenv("SIGNING_PASSWORD")
+    val signingKey: String? = System.getenv("SIGNING_KEY")?.let { base64Key ->
+        String(Base64.getDecoder().decode(base64Key))
+    }
+    if (signingKeyId != null) {
+        useInMemoryPgpKeys(signingKeyId, signingKey, signingPassword)
+        sign(publishing.publications)
+    }
+}

geo/src/androidMain/kotlin/dev/icerock/moko/geo/LocationTracker.kt

@@ -5,6 +5,7 @@
 package dev.icerock.moko.geo
 
 import android.content.Context
+import android.os.Build
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
@@ -36,6 +37,7 @@ actual class LocationTracker(
         it.priority = priority
     }
     private val locationsChannel = Channel<LatLng>(Channel.BUFFERED)
+    private val extendedLocationsChannel = Channel<ExtendedLocation>(Channel.BUFFERED)
     private val trackerScope = CoroutineScope(Dispatchers.Main)
 
     fun bind(lifecycle: Lifecycle, context: Context, fragmentManager: FragmentManager) {
@@ -59,12 +61,54 @@ actual class LocationTracker(
     override fun onLocationResult(locationResult: LocationResult) {
         super.onLocationResult(locationResult)
 
+        val lastLocation = locationResult.lastLocation
+
+        val speedAccuracy = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) null
+        else lastLocation.speedAccuracyMetersPerSecond.toDouble()
+
+        val bearingAccuracy = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) null
+        else lastLocation.bearingAccuracyDegrees.toDouble()
+
+        val verticalAccuracy = if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) null
+        else lastLocation.verticalAccuracyMeters.toDouble()
+
         val latLng = LatLng(
-            locationResult.lastLocation.latitude,
-            locationResult.lastLocation.longitude
+            lastLocation.latitude,
+            lastLocation.longitude
+        )
+
+        val locationPoint = Location(
+            coordinates = latLng,
+            coordinatesAccuracyMeters = lastLocation.accuracy.toDouble()
+        )
+
+        val speed = Speed(
+            speedMps = lastLocation.speed.toDouble(),
+            speedAccuracyMps = speedAccuracy
+        )
+
+        val azimuth = Azimuth(
+            azimuthDegrees = lastLocation.bearing.toDouble(),
+            azimuthAccuracyDegrees = bearingAccuracy
+        )
+
+        val altitude = Altitude(
+            altitudeMeters = lastLocation.altitude,
+            altitudeAccuracyMeters = verticalAccuracy
+        )
+
+        val extendedLocation = ExtendedLocation(
+            location = locationPoint,
+            azimuth = azimuth,
+            speed = speed,
+            altitude = altitude,
+            timestampMs = lastLocation.time
         )
 
-        trackerScope.launch { locationsChannel.send(latLng) }
+        trackerScope.launch {
+            extendedLocationsChannel.send(extendedLocation)
+            locationsChannel.send(latLng)
+        }
     }
 
     actual suspend fun startTracking() {
@@ -93,4 +137,18 @@ actual class LocationTracker(
             awaitClose { job.cancel() }
         }
     }
+
+    actual fun getExtendedLocationsFlow(): Flow<ExtendedLocation> {
+        return channelFlow {
+            val sendChannel = channel
+            val job = launch {
+                while (isActive) {
+                    val extendedLocation = extendedLocationsChannel.receive()
+                    sendChannel.send(extendedLocation)
+                }
+            }
+
+            awaitClose { job.cancel() }
+        }
+    }
 }