Upgrade deps (#15)

README.md

@@ -120,7 +120,6 @@ Then you can create the custom provider and transform it into LiveData or Flow.
 ```kotlin
 private val locationProvider: ILocationProvider = LocationProvider(context, locationRequest)
 
-@ExperimentalCoroutinesApi
 val locationFlow: LocationFlow = locationProvider.asFlow()
 val locationLiveData: LocationLiveData = locationProvider.asLiveData()
 ```

app/build.gradle

@@ -5,15 +5,15 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.2"
     namespace "com.jintin.fancylocation.app"
 
     defaultConfig {
 
+        compileSdk 34
+        buildToolsVersion = "34.0.0"
         applicationId "com.jintin.fancylocation.app"
         minSdkVersion 23
-        targetSdkVersion 33
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -40,14 +40,14 @@ dependencies {
 
 //    implementation 'com.github.jintin:FancyLocationProvider:1.0'
     implementation 'com.google.android.gms:play-services-location:21.0.1'
-    implementation 'androidx.activity:activity-ktx:1.7.2'
+    implementation 'androidx.activity:activity-ktx:1.8.0'
     implementation "com.github.permissions-dispatcher:permissionsdispatcher:4.8.0"
     kapt "com.github.permissions-dispatcher:permissionsdispatcher-processor:4.8.0"
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'androidx.core:core-ktx:1.10.1'
+    implementation 'androidx.core:core-ktx:1.12.0'
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.google.android.material:material:1.10.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
     testImplementation 'junit:junit:4.13.2'
     androidTestImplementation 'androidx.test.ext:junit:1.1.5'

app/src/main/java/com/jintin/fancylocation/app/MainViewModel.kt

@@ -5,7 +5,6 @@ import androidx.lifecycle.AndroidViewModel
 import com.google.android.gms.location.LocationRequest
 import com.google.android.gms.location.Priority
 import com.jintin.fancylocation.*
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 
 class MainViewModel(application: Application) : AndroidViewModel(application) {
     private val locationRequest =
@@ -15,15 +14,13 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
             .setMaxUpdateDelayMillis(3000)
             .build()
 
-//    @ExperimentalCoroutinesApi
 //    val locationFlow = LocationFlow(application, locationRequest)
 //    val locationStateFlow = LocationFlow(application, locationRequest)
 //    val locationLiveData = LocationLiveData(application, locationRequest)
 
     // we can also provide custom vendor by create your own LocationProvider
     private val locationProvider: ILocationProvider = LocationProvider(application, locationRequest)
 
-    @ExperimentalCoroutinesApi
     val locationFlow = locationProvider.asFlow()
     val locationLiveData = locationProvider.asLiveData()
     val locationStateFlow = locationProvider.asStateFlow()

build.gradle

@@ -1,12 +1,12 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.9.0"
+    ext.kotlin_version = "1.9.10"
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.1.0'
+        classpath 'com.android.tools.build:gradle:8.1.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

lib/build.gradle

@@ -4,15 +4,13 @@ plugins {
 }
 
 android {
-    compileSdkVersion 33
-    buildToolsVersion "33.0.2"
     namespace "com.jintin.fancylocation"
 
     defaultConfig {
         minSdkVersion 16
-        targetSdkVersion 33
-        versionCode 1
-        versionName "1.0"
+        compileSdk 34
+        buildToolsVersion = "34.0.0"
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
@@ -36,7 +34,7 @@ android {
 dependencies {
 
     implementation 'com.google.android.gms:play-services-location:21.0.1'
-    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.6.4'
+    implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.1'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     testImplementation 'junit:junit:4.13.2'

lib/src/main/java/com/jintin/fancylocation/LocationData.kt

@@ -3,8 +3,8 @@ package com.jintin.fancylocation
 import android.location.Location
 
 sealed class LocationData {
-    object Init : LocationData()
-    object Loading : LocationData()
+    data object Init : LocationData()
+    data object Loading : LocationData()
     data class Success(val location: Location) : LocationData()
-    object Fail : LocationData()
+    data object Fail : LocationData()
 }

lib/src/main/java/com/jintin/fancylocation/LocationExtension.kt

@@ -1,12 +1,9 @@
 package com.jintin.fancylocation
 
-import kotlinx.coroutines.ExperimentalCoroutinesApi
-
 fun ILocationProvider.asLiveData(): LocationLiveData {
     return LocationLiveData(this)
 }
 
-@ExperimentalCoroutinesApi
 fun ILocationProvider.asFlow(): LocationFlow {
     return LocationFlow(this)
 }

lib/src/main/java/com/jintin/fancylocation/LocationFlow.kt

@@ -5,14 +5,12 @@ import android.content.Context
 import android.location.Location
 import androidx.annotation.RequiresPermission
 import com.google.android.gms.location.LocationRequest
-import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.channels.awaitClose
-import kotlinx.coroutines.channels.sendBlocking
 import kotlinx.coroutines.channels.trySendBlocking
 import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.callbackFlow
 import kotlinx.coroutines.flow.channelFlow
 
-@ExperimentalCoroutinesApi
 class LocationFlow(
     private val locationProvider: ILocationProvider
 ) {
@@ -23,7 +21,7 @@ class LocationFlow(
     ) : this(LocationProvider(context, locationRequest))
 
     @RequiresPermission(anyOf = [Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION])
-    fun get(): Flow<LocationData> = channelFlow {
+    fun get(): Flow<LocationData> = callbackFlow {
         channel.trySendBlocking(LocationData.Loading)
         locationProvider.requestLocationUpdates(object : ILocationObserver {
             override fun onLocationResult(location: Location) {