From 079f07c65ecad2dd3f0230e41889dc8a5b019f9e Mon Sep 17 00:00:00 2001 From: mu Date: Sun, 7 Mar 2021 15:04:26 +0530 Subject: [PATCH] update dependency libraries; remove jCenter as it has reached end of life --- .idea/compiler.xml | 6 ++++++ .idea/gradle.xml | 2 +- .idea/misc.xml | 2 +- .idea/runConfigurations.xml | 12 ----------- airlocationlibrary/build.gradle | 11 +++++----- .../com/airlocationlibrary/AirLocation.kt | 6 +++--- .../helpers/GooglePlayApiHelper.kt | 10 ++++----- .../LocationOptimizationPermissionHelper.kt | 2 +- app/build.gradle | 14 +++++++------ .../com/airlocationproject/MainActivity.kt | 21 +++++++++++-------- build.gradle | 8 +++---- gradle/wrapper/gradle-wrapper.properties | 2 +- 12 files changed, 47 insertions(+), 49 deletions(-) create mode 100644 .idea/compiler.xml delete mode 100644 .idea/runConfigurations.xml diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..fb7f4a8 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml index 56fd2f4..a9cda7e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -4,7 +4,7 @@ - + diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/airlocationlibrary/build.gradle b/airlocationlibrary/build.gradle index 61e936e..b8f74a2 100644 --- a/airlocationlibrary/build.gradle +++ b/airlocationlibrary/build.gradle @@ -1,13 +1,12 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'com.github.dcendents.android-maven' group = 'com.github.mumayank' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { minSdkVersion 17 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" } @@ -15,9 +14,9 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" - api 'com.google.android.gms:play-services-location:17.0.0' + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30" + api 'com.google.android.gms:play-services-location:18.0.0' implementation 'com.github.mumayank:AirPermissionsLibraryProject:3.1' } diff --git a/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/AirLocation.kt b/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/AirLocation.kt index 8f749f2..77abb95 100644 --- a/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/AirLocation.kt +++ b/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/AirLocation.kt @@ -143,7 +143,7 @@ class AirLocation( fusedLocationClient = LocationServices.getFusedLocationProviderClient(activityTemp) val task = fusedLocationClient.lastLocation - task?.addOnSuccessListener { location: Location? -> + task.addOnSuccessListener { location: Location? -> if (activityWeakReference.get() == null) { return@addOnSuccessListener } @@ -156,7 +156,7 @@ class AirLocation( } else { addLifecycleListener() } - }?.addOnFailureListener { + }.addOnFailureListener { if (activityWeakReference.get() == null) { return@addOnFailureListener } @@ -222,7 +222,7 @@ class AirLocation( isLocationRequiredOnlyOneTime ), locationCallback, - Looper.myLooper() + Looper.getMainLooper() ) } diff --git a/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/GooglePlayApiHelper.kt b/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/GooglePlayApiHelper.kt index 600e47e..4bf3fef 100644 --- a/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/GooglePlayApiHelper.kt +++ b/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/GooglePlayApiHelper.kt @@ -11,6 +11,10 @@ class GooglePlayApiHelper( private val onSuccess: (() -> Unit)?, private val onFailure: (() -> Unit)? ) { + companion object { + private const val REQUEST_CODE = 1237 + } + private val activityWeakReference = WeakReference(activity) fun makeItAvailable() { @@ -34,7 +38,7 @@ class GooglePlayApiHelper( ) { onFailure?.invoke() } - errorDialog.show() + errorDialog?.show() } } @@ -48,8 +52,4 @@ class GooglePlayApiHelper( makeItAvailable() } } - - companion object { - private const val REQUEST_CODE = 1237 - } } \ No newline at end of file diff --git a/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/LocationOptimizationPermissionHelper.kt b/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/LocationOptimizationPermissionHelper.kt index 094a41e..b90db40 100644 --- a/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/LocationOptimizationPermissionHelper.kt +++ b/airlocationlibrary/src/main/java/mumayank/com/airlocationlibrary/helpers/LocationOptimizationPermissionHelper.kt @@ -94,7 +94,7 @@ class LocationOptimizationPermissionHelper( locationInterval: Long, isLocationRequiredOnlyOneTime: Boolean ): LocationRequest { - return LocationRequest().apply { + return LocationRequest.create().apply { interval = locationInterval fastestInterval = locationInterval priority = LocationRequest.PRIORITY_HIGH_ACCURACY diff --git a/app/build.gradle b/app/build.gradle index 4206752..1133497 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,22 +1,24 @@ apply plugin: 'com.android.application' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 29 + compileSdkVersion 30 defaultConfig { applicationId "mumayank.com.airlocationproject" minSdkVersion 17 - targetSdkVersion 29 + targetSdkVersion 30 versionCode 1 versionName "1.0" } + buildFeatures { + viewBinding true + } } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.72" - implementation 'androidx.appcompat:appcompat:1.1.0' - implementation 'androidx.core:core-ktx:1.3.0' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.4.30" + implementation 'androidx.appcompat:appcompat:1.2.0' + implementation 'androidx.core:core-ktx:1.3.2' implementation project(":airlocationlibrary") } diff --git a/app/src/main/java/mumayank/com/airlocationproject/MainActivity.kt b/app/src/main/java/mumayank/com/airlocationproject/MainActivity.kt index b9c1bb1..dbd52b0 100644 --- a/app/src/main/java/mumayank/com/airlocationproject/MainActivity.kt +++ b/app/src/main/java/mumayank/com/airlocationproject/MainActivity.kt @@ -6,25 +6,27 @@ import android.os.Bundle import android.view.View import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import kotlinx.android.synthetic.main.main_activity.* import mumayank.com.airlocationlibrary.AirLocation +import mumayank.com.airlocationproject.databinding.MainActivityBinding import java.util.* class MainActivity : AppCompatActivity() { + private lateinit var binding: MainActivityBinding + private val airLocation = AirLocation(this, object : AirLocation.Callback { override fun onSuccess(locations: ArrayList) { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE var string = "\n" for (location in locations) { string = "${location.longitude}, ${location.latitude}\n$string" } - string = "$string${textView2.text}" - textView2.text = string + string = "$string${binding.textView2.text}" + binding.textView2.text = string } override fun onFailure(locationFailedEnum: AirLocation.LocationFailedEnum) { - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE Toast.makeText(this@MainActivity, locationFailedEnum.name, Toast.LENGTH_SHORT) .show() } @@ -32,12 +34,13 @@ class MainActivity : AppCompatActivity() { override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - setContentView(R.layout.main_activity) + binding = MainActivityBinding.inflate(layoutInflater) + setContentView(binding.root) - progressBar.visibility = View.GONE + binding.progressBar.visibility = View.GONE - button2.setOnClickListener { - progressBar.visibility = View.VISIBLE + binding.button2.setOnClickListener { + binding.progressBar.visibility = View.VISIBLE airLocation.start() } diff --git a/build.gradle b/build.gradle index c20dadf..38c5a23 100644 --- a/build.gradle +++ b/build.gradle @@ -1,11 +1,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:4.0.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72" + classpath 'com.android.tools.build:gradle:7.0.0-alpha08' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.30" classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } @@ -13,7 +13,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() maven { url 'https://jitpack.io' } } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 4019b72..1319147 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https://services.gradle.org/distributions/gradle-6.8.2-all.zip