Skip to content
This repository was archived by the owner on Jun 20, 2020. It is now read-only.

Commit b10ac1b

Browse files
committed
Updated Kotlin to 1.3.41, Updated Kotlin coroutines to Kotlinx, Updated Android packages to Androidx. Renamed package to new_geolocation for republishing.
1 parent ff0b356 commit b10ac1b

File tree

79 files changed

+505
-298
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+505
-298
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,4 @@ build/
88
ios/.generated/
99
packages
1010
pubspec.lock
11+
.vscode

CHANGELOG.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,25 @@
1+
## [1.0.0]
2+
3+
* Updated Kotlin to 1.3.41
4+
* Updated Kotlin experimental coroutines to Kotlinx
5+
* Updated Android packages to Androidx (hence major release increment)
6+
7+
## [0.2.3]
8+
9+
* Added updated pubspec description
10+
* Flutter format on number of files
11+
12+
## [0.2.2]
13+
14+
* Better encoding of 'options' on LocationUpdatesRequest [hoggetaylor]
15+
* Fix argument of type string can not be assigned to DiagnosticsNode [osamagamal65]
16+
* Adding support for new method to request enabling location services [shehabic]
17+
* Updated Readme [shehabic]
18+
* Various fixes for XCode 10, and Cocoa Pods 1.5.3 [shehabic]
19+
* Updated Google Play Services Version [shehabic]
20+
* Fixed serialization from dart to native platforms [shehabic]
21+
* Updated kotlin version [shehabic]
22+
123
## [0.2.1]
224

325
* Replace `requestPermission(permission)` named parameter by positional

README.md

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
# Geolocation (Forked and fixed)
1+
# new_geolocation
22

3-
[![pub package](https://img.shields.io/pub/v/geolocation.svg)](https://pub.dartlang.org/packages/geolocation)
3+
[![pub package](https://img.shields.io/pub/v/new_geolocation.svg)](https://pub.dartlang.org/packages/new_geolocation)
44

5-
Flutter [geolocation plugin](https://pub.dartlang.org/packages/geolocation/) for Android API 16+ and iOS 9+.
5+
Flutter [new_geolocation plugin](https://pub.dartlang.org/packages/new_geolocation/) for Android API 16+ and iOS 9+.
66

77
Features:
88

@@ -21,7 +21,7 @@ The plugin is under active development and the following features are planned so
2121

2222
Android | iOS
2323
:---: | :---:
24-
![](https://github.com/loup-v/geolocation/blob/master/doc/android_screenshot.jpg?raw=true) | ![](https://github.com/loup-v/geolocation/blob/master/doc/ios_screenshot.jpg?raw=true)
24+
![](https://github.com/alfanhui/new_geolocation/blob/master/doc/android_screenshot.jpg?raw=true) | ![](https://github.com/alfanhui/new_geolocation/blob/master/doc/ios_screenshot.jpg?raw=true)
2525

2626

2727
## Installation
@@ -30,15 +30,30 @@ Add geolocation to your pubspec.yaml:
3030

3131
```yaml
3232
dependencies:
33-
geolocation:
33+
new_geolocation:
3434
git:
35-
url: https://github.com/shehabic/geolocation
35+
url: https://github.com/alfanhui/new_geolocation
36+
```
37+
38+
## Import
39+
40+
Package is called new_geolocation, with Geolocation being the base class.
41+
42+
```dart
43+
import 'package:new_geolocation/geolocation.dart';
3644
```
3745

3846
**Note:** There is a known issue for integrating swift written plugin into Flutter project created with Objective-C template.
3947
See issue [Flutter#16049](https://github.com/flutter/flutter/issues/16049) for help on integration.
4048

4149

50+
### AndroidX Requirement
51+
You may need to updated your '/android/gradle.properties' to include use of AndroidX.
52+
```
53+
android.useAndroidX=true
54+
android.enableJetifier=true
55+
```
56+
4257
### Permission
4358

4459
Android and iOS require to declare the location permission in a configuration file.
@@ -241,6 +256,7 @@ You can contact us at <hello@intheloup.io>
241256
* shehabic-work
242257
* Abgaryan
243258
* shehabic
259+
* alfanhui
244260

245261
## License
246262

android/.classpath

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<classpath>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-12/"/>
4+
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
5+
<classpathentry kind="output" path="bin/default"/>
6+
</classpath>

android/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,5 @@
66
.DS_Store
77
/build
88
/captures
9+
.project
10+
.settings

android/build.gradle

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
group 'io.intheloup.geolocation'
1+
group 'io.alfanhui.new_geolocation'
22
version '1.0-SNAPSHOT'
33

44
buildscript {
5-
ext.kotlin_version = '1.2.71'
5+
ext.kotlin_version = '1.3.41'
66
repositories {
77
google()
88
jcenter()
99
}
1010

1111
dependencies {
12-
classpath 'com.android.tools.build:gradle:3.1.2'
12+
classpath 'com.android.tools.build:gradle:3.3.0'
1313
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1414
}
1515
}
@@ -25,24 +25,25 @@ apply plugin: 'com.android.library'
2525
apply plugin: 'kotlin-android'
2626

2727
android {
28-
compileSdkVersion 27
28+
compileSdkVersion 28
2929

3030
sourceSets {
3131
main.java.srcDirs += 'src/main/kotlin'
3232
}
3333
defaultConfig {
3434
minSdkVersion 16
35-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
35+
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
3636
}
3737
lintOptions {
3838
disable 'InvalidPackage'
3939
}
4040
}
4141

4242
dependencies {
43-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
44-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.22.5"
45-
46-
api "com.google.android.gms:play-services-location:16.0.0"
43+
implementation 'androidx.core:core:1.0.2'
44+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
45+
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.0-RC2'
46+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.0-RC2"
47+
api "com.google.android.gms:play-services-location:17.0.0"
4748
implementation 'com.squareup.moshi:moshi:1.5.0'
48-
}
49+
}

android/gradle.properties

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
org.gradle.jvmargs=-Xmx1536M
2+
android.useAndroidX=true
3+
android.enableJetifier=true

android/settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
rootProject.name = 'geolocation'
1+
rootProject.name = 'new_geolocation'
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="io.intheloup.geolocation">
2+
package="io.alfanhui.new_geolocation">
33
</manifest>

android/src/main/kotlin/io/intheloup/geolocation/Codec.kt renamed to android/src/main/kotlin/io/alfanhui/new_geolocation/Codec.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
// Copyright (c) 2018 Loup Inc.
22
// Licensed under Apache License v2.0
33

4-
package io.intheloup.geolocation
4+
package io.alfanhui.new_geolocation
55

66
import com.squareup.moshi.Moshi
7-
import io.intheloup.geolocation.data.LocationUpdatesRequest
8-
import io.intheloup.geolocation.data.Permission
9-
import io.intheloup.geolocation.data.Priority
10-
import io.intheloup.geolocation.data.Result
7+
import io.alfanhui.new_geolocation.data.LocationUpdatesRequest
8+
import io.alfanhui.new_geolocation.data.Permission
9+
import io.alfanhui.new_geolocation.data.Priority
10+
import io.alfanhui.new_geolocation.data.Result
1111

1212
object Codec {
1313

0 commit comments

Comments
 (0)