Skip to content

Commit

Permalink
Merge pull request #6 from icerockdev/develop
Browse files Browse the repository at this point in the history
Release 0.2.0
  • Loading branch information
Alex009 authored Mar 14, 2020
2 parents 8ca2e3c + 2e856d1 commit 240b673
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 23 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/compilation-check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build and publish local
- name: Check build
run: ./gradlew -PlibraryPublish :geo:publishToMavenLocal
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ jobs:
uses: actions/setup-java@v1
with:
java-version: 1.8
- name: Build and publish to Bintray
- name: Publish
run: ./gradlew -PlibraryPublish :geo:publishAllPublicationsToBintrayRepository -DBINTRAY_USER=${{ secrets.BINTRAY_USER }} -DBINTRAY_KEY=${{ secrets.BINTRAY_KEY }}
15 changes: 6 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -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.61-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.3.70-orange)

# Mobile Kotlin geolocation module
This is a Kotlin Multiplatform library that provides geolocation to common code.
Expand All @@ -19,14 +19,16 @@ This is a Kotlin Multiplatform library that provides geolocation to common code.
- **Geolocation tracking** - track user geolocation from common code;

## Requirements
- Gradle version 5.4.1+
- Gradle version 5.6.4+
- Android API 16+
- iOS version 9.0+

## Versions
- kotlin 1.3.61
- 0.1.0
- 0.1.1
- kotlin 1.3.70
- 0.2.0

## Installation
root build.gradle
Expand All @@ -41,15 +43,10 @@ allprojects {
project build.gradle
```groovy
dependencies {
commonMainApi("dev.icerock.moko:geo:0.1.1")
commonMainApi("dev.icerock.moko:geo:0.2.0")
}
```

settings.gradle
```groovy
enableFeaturePreview("GRADLE_METADATA")
```

## Usage
in common code:
```kotlin
Expand Down Expand Up @@ -103,7 +100,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 `:geo:publishToMavenLocal` gradle task - so that sample apps use the locally published version.
- For local testing use the `./publishToMavenLocal.sh` script - so that sample apps use the locally published version.

## 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`.
Expand Down
6 changes: 3 additions & 3 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,9 @@ repositories {
}

dependencies {
implementation("dev.icerock:mobile-multiplatform:0.4.0")
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
implementation("com.android.tools.build:gradle:3.5.2")
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 {
Expand Down
14 changes: 7 additions & 7 deletions buildSrc/src/main/kotlin/Versions.kt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ object Versions {
const val minSdk = 16
}

const val kotlin = "1.3.61"
const val kotlin = "1.3.70"

object Libs {
object Android {
Expand All @@ -16,11 +16,11 @@ object Versions {
}

object MultiPlatform {
const val coroutines = "1.3.3"
const val mokoGeo = "0.1.1"
const val mokoParcelize = "0.2.0"
const val mokoPermissions = "0.3.0"
const val mokoMvvm = "0.4.0"
const val coroutines = "1.3.4"
const val mokoGeo = "0.2.0"
const val mokoParcelize = "0.3.0"
const val mokoPermissions = "0.5.0"
const val mokoMvvm = "0.6.0"
}
}
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
1 change: 1 addition & 0 deletions publishToMavenLocal.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
./gradlew -PlibraryPublish :geo:publishToMavenLocal $*
2 changes: 1 addition & 1 deletion sample/ios-app/Podfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 1b71d80cc7f81711555670bda957555a8503b31a

COCOAPODS: 1.8.3
COCOAPODS: 1.9.0

0 comments on commit 240b673

Please sign in to comment.