yayaa · andreabellitto · Sep 4, 2023 · Sep 4, 2023
diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
@@ -22,6 +22,6 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew build jacocoTestReport assembleAndroidTest
     - name: Codecov
-      uses: codecov/codecov-action@v1.0.7
+      uses: codecov/codecov-action@v3.1.4
 
 
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,8 @@ android:
   components:
     - tools
     - platform-tools
-    - build-tools-29.0.0
-    - android-29
+    - build-tools-33.0.2
+    - android-33
 
     - extra-google-google_play_services
     - extra-google-m2repository
@@ -23,7 +23,7 @@ android:
     - 'android-sdk-license-.+'
 
 before_install:
-  - yes | sdkmanager "platforms;android-29"
+  - yes | sdkmanager "platforms;android-33"
 
 script:
   - ./gradlew clean check --stacktrace --no-daemon

diff --git a/app/build.gradle b/app/build.gradle
@@ -1,6 +1,8 @@
 apply plugin: 'com.android.application'
 
 android {
+    namespace 'com.yayandroid.locationmanager.sample'
+
     compileSdkVersion versions.compileSdkVersion
     buildToolsVersion versions.buildToolsVersion
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,8 @@
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning" >
 
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

diff --git a/build.gradle b/build.gradle
@@ -3,45 +3,44 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.3'
-        classpath 'com.dicedmelon.gradle:jacoco-android:0.1.4'
+        classpath 'com.android.tools.build:gradle:8.1.1'
+        classpath 'org.jacoco:org.jacoco.core:0.8.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
-task clean(type: Delete) {
+tasks.register('clean', Delete) {
     delete rootProject.buildDir
 }
 
-
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 
     project.ext {
         versions = [
               minSdkVersion    : 14,
-              compileSdkVersion: 29,
-              targetSdkVersion : 29,
-              buildToolsVersion: '29.0.0'
+              compileSdkVersion: 33,
+              targetSdkVersion : 33,
+              buildToolsVersion: '33.0.2'
         ]
 
         libraries = [
-              appCompat         : 'androidx.appcompat:appcompat:1.1.0',
-              googlePlayServices: 'com.google.android.gms:play-services-location:17.0.0',
+              appCompat         : 'androidx.appcompat:appcompat:1.6.1',
+              googlePlayServices: 'com.google.android.gms:play-services-location:21.0.1',
 
               junit             : 'junit:junit:4.12',
               assertJ           : 'com.squareup.assertj:assertj-android:1.1.1',
-              mockito           : 'org.mockito:mockito-core:2.7.2',
+              mockito           : 'org.mockito:mockito-core:4.2.0',
 
-              leakcanary        : 'com.squareup.leakcanary:leakcanary-android:2.4'
+              leakcanary        : 'com.squareup.leakcanary:leakcanary-android:2.12'
         ]
     }
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Sat Feb 01 14:17:05 CET 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,7 +1,9 @@
 apply plugin: 'com.android.library'
-apply plugin: 'jacoco-android'
+apply plugin: 'jacoco'
 
 android {
+    namespace 'com.yayandroid.locationmanager'
+
     compileSdkVersion versions.compileSdkVersion
     buildToolsVersion versions.buildToolsVersion
 

diff --git a/library/gradle.properties b/library/gradle.properties
@@ -20,8 +20,8 @@
 POM_NAME=LocationManager Library
 POM_ARTIFACT_ID=LocationManager
 POM_PACKAGING=aar
-VERSION_NAME=2.4.1
-VERSION_CODE=29
+VERSION_NAME=2.5.0
+VERSION_CODE=30
 GROUP=com.yayandroid
 
 POM_DESCRIPTION=LocationManager Library

diff --git a/library/maven_push.gradle b/library/maven_push.gradle
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-apply plugin: 'maven'
+apply plugin: 'maven-publish'
 apply plugin: 'signing'
 
 def isReleaseBuild() {
@@ -39,74 +39,73 @@ def getRepositoryPassword() {
     return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
 }
 
-afterEvaluate { project ->
-    uploadArchives {
-        repositories {
-            mavenDeployer {
-                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+publishing {
+    publications {
+        maven(MavenPublication) {
 
-                pom.groupId = GROUP
-                pom.artifactId = POM_ARTIFACT_ID
-                pom.version = VERSION_NAME
+            groupId = GROUP
+            artifactId = POM_ARTIFACT_ID
+            version = VERSION_NAME
 
-                repository(url: getReleaseRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
-                snapshotRepository(url: getSnapshotRepositoryUrl()) {
-                    authentication(userName: getRepositoryUsername(), password: getRepositoryPassword())
-                }
+            pom {
+                name.set(POM_NAME)
+                packaging POM_PACKAGING
+                description POM_DESCRIPTION
+                url.set(POM_URL)
 
-                pom.project {
-                    name POM_NAME
-                    packaging POM_PACKAGING
-                    description POM_DESCRIPTION
-                    url POM_URL
-
-                    scm {
-                        url POM_SCM_URL
-                        connection POM_SCM_CONNECTION
-                        developerConnection POM_SCM_DEV_CONNECTION
-                    }
+                scm {
+                    url.set(POM_SCM_URL)
+                    connection.set(POM_SCM_CONNECTION)
+                    developerConnection.set(POM_SCM_DEV_CONNECTION)
+                }
 
-                    licenses {
-                        license {
-                            name POM_LICENCE_NAME
-                            url POM_LICENCE_URL
-                            distribution POM_LICENCE_DIST
-                        }
+                licenses {
+                    license {
+                        name.set(POM_LICENCE_NAME)
+                        url.set(POM_LICENCE_URL)
+                        distribution.set(POM_LICENCE_DIST)
                     }
+                }
 
-                    developers {
-                        developer {
-                            id POM_DEVELOPER_ID
-                            name POM_DEVELOPER_NAME
-                        }
+                developers {
+                    developer {
+                        id.set(POM_DEVELOPER_ID)
+                        name.set(POM_DEVELOPER_NAME)
                     }
                 }
             }
         }
     }
-
-    signing {
-        required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
-        sign configurations.archives
+    repositories {
+        maven {
+            url = version.endsWith("SNAPSHOT") ? getSnapshotRepositoryUrl() : getReleaseRepositoryUrl()
+            credentials {
+                username getRepositoryUsername()
+                password getRepositoryPassword()
+            }
+        }
     }
+}
 
-    //task androidJavadocs(type: Javadoc) {
-    //source = android.sourceSets.main.allJava
-    //}
+signing {
+    required { isReleaseBuild() && gradle.taskGraph.hasTask("uploadArchives") }
+    sign configurations.archives
+}
 
-    //task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
-    //classifier = 'javadoc'
-    //from androidJavadocs.destinationDir
-    //}
+//task androidJavadocs(type: Javadoc) {
+//source = android.sourceSets.main.allJava
+//}
 
-    task androidSourcesJar(type: Jar) {
-        classifier = 'sources'
-        from android.sourceSets.main.java.sourceFiles
-    }
+//task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+//classifier = 'javadoc'
+//from androidJavadocs.destinationDir
+//}
 
-    artifacts {
-        archives androidSourcesJar
-    }
+tasks.register('androidSourcesJar', Jar) {
+    archiveClassifier.set("sources")
+    from android.sourceSets.main.java.sourceFiles
+}
+
+artifacts {
+    archives androidSourcesJar
 }
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,2 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.yayandroid.locationmanager" />
+<manifest package="com.yayandroid.locationmanager"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+</manifest>
diff --git a/library/src/main/java/com/yayandroid/locationmanager/LocationManager.java b/library/src/main/java/com/yayandroid/locationmanager/LocationManager.java
@@ -22,15 +22,15 @@
 
 public class LocationManager implements PermissionListener {
 
-    private LocationListener listener;
-    private LocationConfiguration configuration;
-    private LocationProvider activeProvider;
-    private PermissionProvider permissionProvider;
+    private final LocationListener listener;
+    private final LocationConfiguration configuration;
+    private final LocationProvider activeProvider;
+    private final PermissionProvider permissionProvider;
 
     /**
      * Library tries to log as much as possible in order to make it transparent to see what is actually going on
      * under the hood. You can enable it for debug purposes, but do not forget to disable on production.
-     *
+     * <p>
      * Log is disabled as default.
      */
     public static void enableLog(boolean enable) {
@@ -60,7 +60,7 @@ private LocationManager(Builder builder) {
 
     public static class Builder {
 
-        private ContextProcessor contextProcessor;
+        private final ContextProcessor contextProcessor;
         private LocationListener listener;
         private LocationConfiguration configuration;
         private LocationProvider activeProvider;
@@ -159,7 +159,7 @@ public LocationConfiguration getConfiguration() {
 
     /**
      * Google suggests to stop location updates when the activity is no longer in focus
-     * http://developer.android.com/training/location/receive-location-updates.html#stop-updates
+     * <a href="http://developer.android.com/training/location/receive-location-updates.html#stop-updates">...</a>
      */
     public void onPause() {
         activeProvider.onPause();
@@ -240,7 +240,7 @@ void askForPermission() {
                 LogUtils.logI("Waiting until we receive any callback from PermissionProvider...");
             } else {
                 LogUtils.logI("Couldn't get permission, Abort!");
-                failed(FailType.PERMISSION_DENIED);
+                failed();
             }
         }
     }
@@ -255,9 +255,9 @@ private void permissionGranted(boolean alreadyHadPermission) {
         activeProvider.get();
     }
 
-    private void failed(@FailType int type) {
+    private void failed() {
         if (listener != null) {
-            listener.onLocationFailed(type);
+            listener.onLocationFailed(FailType.PERMISSION_DENIED);
         }
     }
 
@@ -268,6 +268,6 @@ public void onPermissionsGranted() {
 
     @Override
     public void onPermissionsDenied() {
-        failed(FailType.PERMISSION_DENIED);
+        failed();
     }
 }
diff --git a/library/src/main/java/com/yayandroid/locationmanager/base/LocationBaseFragment.java b/library/src/main/java/com/yayandroid/locationmanager/base/LocationBaseFragment.java
@@ -1,5 +1,6 @@
 package com.yayandroid.locationmanager.base;
 
+import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 
@@ -35,11 +36,14 @@ protected void getLocation() {
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        locationManager = new LocationManager.Builder(getContext().getApplicationContext())
-              .configuration(getLocationConfiguration())
-              .fragment(this)
-              .notify(this)
-              .build();
+        Context context = getContext();
+        if (context != null) {
+            locationManager = new LocationManager.Builder(context.getApplicationContext())
+                    .configuration(getLocationConfiguration())
+                    .fragment(this)
+                    .notify(this)
+                    .build();
+        }
     }
 
     @CallSuper

diff --git a/library/src/main/java/com/yayandroid/locationmanager/configuration/Configurations.java b/library/src/main/java/com/yayandroid/locationmanager/configuration/Configurations.java
@@ -25,7 +25,7 @@ public static LocationConfiguration silentConfiguration() {
      * Returns a LocationConfiguration that will never ask user anything and will try to use whatever possible options
      * that application has to obtain location. If there is no sufficient permission, provider, etc... then
      * LocationManager will call {@linkplain LocationListener#onLocationFailed(int)} silently
-     *
+     * <p>
      * # Best use case of this configuration is within Service implementations
      */
     public static LocationConfiguration silentConfiguration(boolean keepTracking) {

diff --git a/.../main/java/com/yayandroid/locationmanager/configuration/DefaultProviderConfiguration.java b/.../main/java/com/yayandroid/locationmanager/configuration/DefaultProviderConfiguration.java
@@ -156,7 +156,7 @@ public Builder gpsMessage(String gpsMessage) {
          * implementation of {@linkplain DialogProvider} and manager will use that implementation to display the dialog.
          * Important, if you set your own implementation, please make sure to handle gpsMessage as well.
          * Because {@linkplain DefaultProviderConfiguration.Builder#gpsMessage} will be ignored in that case.
-         *
+         * <p>
          * If you don't specify any dialogProvider implementation {@linkplain SimpleMessageDialogProvider} will be used with
          * given {@linkplain DefaultProviderConfiguration.Builder#gpsMessage}
          */