Android 16, AGP 8.13

app/build.gradle

@@ -6,11 +6,11 @@ def getGitHash = providers.exec {
 
 android {
     buildToolsVersion = rootProject.ext.buildToolsVersion
-    namespace 'org.runnerup'
+    namespace = 'org.runnerup'
 
     compileOptions {
-        sourceCompatibility JavaVersion.toVersion("17")
-        targetCompatibility JavaVersion.toVersion("17")
+        sourceCompatibility = JavaVersion.toVersion("17")
+        targetCompatibility = JavaVersion.toVersion("17")
     }
 
     sourceSets {
@@ -44,13 +44,13 @@ android {
     flavorDimensions = [ "all" ]
     productFlavors {
         latest {
-            dimension "all"
+            dimension = "all"
             // multidexing support, min play support
-            minSdk rootProject.ext.minSdk
-            compileSdk rootProject.ext.compileSdk
-            targetSdk rootProject.ext.targetSdk
-            versionName rootProject.ext.versionName
-            versionCode rootProject.ext.latestBaseVersionCode + rootProject.ext.versionCode
+            minSdk = rootProject.ext.minSdk
+            compileSdk = rootProject.ext.compileSdk
+            targetSdk = rootProject.ext.targetSdk
+            versionName = rootProject.ext.versionName
+            versionCode = rootProject.ext.latestBaseVersionCode + rootProject.ext.versionCode
         }
     }
 
@@ -60,7 +60,7 @@ android {
             // enable rootProject.ext.allowNonFree && gradle.startParameter.taskNames.contains("assembleLatestRelease")
             // relevant archs only - these are the only available anyway for newer NDK
             include 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-            universalApk true
+            universalApk = true
         }
     }
 
@@ -86,22 +86,22 @@ android {
             versionNameSuffix = "-${getGitHash}"
         }
         release {
-            debuggable false
-            applicationIdSuffix ""
+            debuggable = false
+            applicationIdSuffix = ""
 
-            minifyEnabled rootProject.ext.allowNonFree
-            shrinkResources rootProject.ext.allowNonFree
+            minifyEnabled = rootProject.ext.allowNonFree
+            shrinkResources = rootProject.ext.allowNonFree
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.txt'
-            signingConfig signingConfigs.release
+            signingConfig = signingConfigs.release
         }
     }
     lint {
-        baseline file('lint-baseline.xml')
-        checkReleaseBuilds true
-        lintConfig file('lint.xml')
-        showAll true
-        //textOutput 'stdout'
-        textReport true
+        baseline = file('lint-baseline.xml')
+        checkReleaseBuilds = true
+        lintConfig = file('lint.xml')
+        showAll = true
+        //textOutput = 'stdout'
+        textReport = true
     }
     bundle {
         language {
@@ -110,21 +110,21 @@ android {
         }
     }
     buildFeatures {
-        aidl true
-        buildConfig true
+        aidl = true
+        buildConfig = true
     }
     androidResources {
-        generateLocaleConfig true
+        generateLocaleConfig = true
     }
 }
 
 repositories {
     google()
     mavenCentral() //MapBox GraphView
-    maven { url "https://oss.sonatype.org/content/groups/public/" } //pebblekit
+    maven { url = "https://oss.sonatype.org/content/groups/public/" } //pebblekit
     if (rootProject.ext.useMapBox) {
         maven {
-            url 'https://api.mapbox.com/downloads/v2/releases/maven'
+            url = 'https://api.mapbox.com/downloads/v2/releases/maven'
             authentication {
                 basic(BasicAuthentication)
             }
@@ -144,10 +144,10 @@ repositories {
 // Duplicate class kotlin.collections.jdk8 (from MapBox?)
 dependencies {
     constraints {
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.8.0") {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk7:2.2.0") {
             because("kotlin-stdlib-jdk7 is now a part of kotlin-stdlib")
         }
-        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.8.0") {
+        implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8:2.2.0") {
             because("kotlin-stdlib-jdk8 is now a part of kotlin-stdlib")
         }
     }
@@ -163,7 +163,7 @@ dependencies {
     implementation "androidx.viewpager2:viewpager2:1.1.0"
     implementation "androidx.constraintlayout:constraintlayout:2.2.1"
 
-    latestImplementation "com.google.android.material:material:1.12.0"
+    latestImplementation "com.google.android.material:material:1.13.0"
     if (rootProject.ext.enableWear) {
         // Build Wear separately, do not include in phone apk
         // latestWearApp project(':wear')
@@ -172,7 +172,7 @@ dependencies {
         latestImplementation "com.google.android.gms:play-services-wearable:${rootProject.ext.googlePlayServicesWearableVersion}"
     }
 
-    implementation "com.squareup.okhttp3:okhttp:5.1.0"
+    implementation "com.squareup.okhttp3:okhttp:5.3.2"
     latestImplementation 'com.getpebble:pebblekit:4.0.1'
     if (rootProject.ext.allowNonFree) {
         // MapBox uses telemetry, without Play there may be exceptions from mapbox (OK to ignore)

app/lint-baseline.xml

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 8.11.1" type="baseline" client="gradle" dependencies="false" name="AGP (8.11.1)" variant="all" version="8.11.1">
+<issues format="6" by="lint 8.12.3" type="baseline" client="gradle" dependencies="false" name="AGP (8.12.3)" variant="all" version="8.12.3">
+
+    <issue
+        id="MissingPermission"
+        message="Call requires permission which may be rejected by user: code should explicitly check to see if permission is available (with `checkPermission`) or explicitly handle a potential `SecurityException`"
+        errorLine1="      Location tmp = lm.getLastKnownLocation(s);"
+        errorLine2="                     ~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="src/main/org/runnerup/tracker/component/TrackerGPS.java"
+            line="123"
+            column="22"/>
+    </issue>
 
     <issue
         id="UnusedAttribute"
@@ -60,14 +71,14 @@
         id="Aligned16KB"
         message="The native library `arm64-v8a/libmapbox-gl.so` (from `com.mapbox.mapboxsdk:mapbox-android-sdk-gl-core:5.2.2`) is not 16 KB aligned">
         <location
-            file="$GRADLE_USER_HOME/caches/8.13/transforms/374b0f5ddf7a7b7bd2585a649e851b6e/transformed/jetified-mapbox-android-sdk-gl-core-5.2.2/jni/arm64-v8a/libmapbox-gl.so"/>
+            file="$GRADLE_USER_HOME/caches/8.13/transforms/42de1f8347fab8a0bff82f7b8295106e/transformed/jetified-mapbox-android-sdk-gl-core-5.2.2/jni/arm64-v8a/libmapbox-gl.so"/>
     </issue>
 
     <issue
         id="Aligned16KB"
         message="The native library `arm64-v8a/libmapbox-gl.so` (from `com.mapbox.mapboxsdk:mapbox-android-sdk-gl-core:5.2.2`) is not 16 KB aligned">
         <location
-            file="$GRADLE_USER_HOME/caches/8.13/transforms/374b0f5ddf7a7b7bd2585a649e851b6e/transformed/jetified-mapbox-android-sdk-gl-core-5.2.2/jni/arm64-v8a/libmapbox-gl.so"/>
+            file="$GRADLE_USER_HOME/caches/8.13/transforms/42de1f8347fab8a0bff82f7b8295106e/transformed/jetified-mapbox-android-sdk-gl-core-5.2.2/jni/arm64-v8a/libmapbox-gl.so"/>
     </issue>
 
     <issue

build.gradle

@@ -4,7 +4,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.11.1'
+        classpath 'com.android.tools.build:gradle:8.13.2'
     }
 }
 
@@ -15,9 +15,9 @@ repositories {
 project.ext {
     //Common settings for most builds
     //Note that Android Studio does not know about the 'ext' module and will warn
-    buildToolsVersion = '36.0.0' //Update Travis manually
-    compileSdk = 35 //Update Travis manually
-    targetSdk = 35
+    buildToolsVersion = '36.1.0' //Update Travis manually
+    compileSdk = 36.1 //Update Travis manually
+    targetSdk = 36.1
     minSdk = 21
 
     appcompat_version = "1.7.1"
@@ -28,7 +28,7 @@ project.ext {
     googleWearVersion = '2.9.0'
 
     junitVersion = '4.13.2'
-    mockitoVersion = '5.18.0'
+    mockitoVersion = '5.21.0'
 
     //The Git tag for the release must be identical for F-Droid
     versionName = '2.9.0.6'

common/build.gradle

@@ -1,18 +1,18 @@
 apply plugin: 'com.android.library'
 
 android {
-    namespace 'org.runnerup'
-    compileSdk rootProject.ext.compileSdk
-    buildToolsVersion rootProject.ext.buildToolsVersion
+    namespace = 'org.runnerup'
+    compileSdk = rootProject.ext.compileSdk
+    buildToolsVersion = rootProject.ext.buildToolsVersion
 
     compileOptions {
-        sourceCompatibility JavaVersion.toVersion("17")
-        targetCompatibility JavaVersion.toVersion("17")
+        sourceCompatibility = JavaVersion.toVersion("17")
+        targetCompatibility = JavaVersion.toVersion("17")
     }
 
     defaultConfig {
-        minSdk rootProject.ext.minSdk
-        targetSdk rootProject.ext.targetSdk
+        minSdk = rootProject.ext.minSdk
+        targetSdk = rootProject.ext.targetSdk
         // Default, needed by test
         buildConfigField ('String', 'applicationIdFull', '"' + rootProject.ext.applicationId + '"')
     }
@@ -26,27 +26,27 @@ android {
                 resValue "string", "app_name", "dRunnerUp"
             }
             release {
-                debuggable false
+                debuggable = false
                 buildConfigField ('String', 'applicationIdFull', '"' + rootProject.ext.applicationId + '"')
                 resValue "string", "applicationIdFull", rootProject.ext.applicationId
 
-                minifyEnabled false
+                minifyEnabled = false
             }
         }
     }
     lint {
-        showAll true
+        showAll = true
         warning 'MissingTranslation'
-        baseline file('lint-baseline.xml')
-        lintConfig file('lint.xml')
-        checkReleaseBuilds true
-        lintConfig file('lint.xml')
-        //textOutput 'stdout'
-        textReport true
+        baseline = file('lint-baseline.xml')
+        lintConfig = file('lint.xml')
+        checkReleaseBuilds = true
+        lintConfig = file('lint.xml')
+        //textOutput = 'stdout'
+        textReport = true
     }
-    namespace 'org.runnerup.common'
+    namespace = 'org.runnerup.common'
     buildFeatures {
-        buildConfig true
+        buildConfig = true
     }
 
     sourceSets {
@@ -67,7 +67,7 @@ repositories {
 dependencies {
     implementation "androidx.annotation:annotation:${rootProject.ext.annotation_version}"
 
-    testImplementation 'org.hamcrest:hamcrest:2.2'
+    testImplementation 'org.hamcrest:hamcrest:3.0'
     testImplementation "junit:junit:${rootProject.ext.junitVersion}"
     testImplementation "org.mockito:mockito-core:${rootProject.ext.mockitoVersion}"
 

common/lint-baseline.xml

@@ -1,5 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<issues format="6" by="lint 7.4.1" type="baseline" client="gradle" dependencies="false" name="AGP (7.4.1)" variant="all" version="7.4.1">
+<issues format="6" by="lint 8.13.2" type="baseline" client="gradle" dependencies="false" name="AGP (8.13.2)" variant="all" version="8.13.2">
+
+    <issue
+        id="AndroidGradlePluginVersion"
+        message="A newer version of Gradle than 8.13 is available: 8.14.3"
+        errorLine1="distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip"
+        errorLine2="                ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
+        <location
+            file="../gradle/wrapper/gradle-wrapper.properties"
+            line="3"
+            column="17"/>
+    </issue>
 
     <issue
         id="IconMissingDensityFolder"

common/src/test/java/org/runnerup/common/util/ValueModelTest.java

@@ -4,8 +4,8 @@
 import static org.hamcrest.CoreMatchers.nullValue;
 import static org.hamcrest.core.IsEqual.equalTo;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.anyObject;
-import static org.mockito.Matchers.eq;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.never;
 import static org.mockito.Mockito.verify;
@@ -71,7 +71,7 @@ public void shouldNotCallListenerIfValueIsNull() {
 
     sut.set(null);
 
-    verify(listener, never()).onValueChanged(eq(sut), anyObject(), anyObject());
+    verify(listener, never()).onValueChanged(eq(sut), any(), any());
   }
 
   @Test
@@ -82,7 +82,7 @@ public void shouldNotCallListenerIfListenerIsRemoved() {
     sut.unregisterChangeListener(listener);
     sut.set(newValue);
 
-    verify(listener, never()).onValueChanged(eq(sut), anyObject(), anyObject());
+    verify(listener, never()).onValueChanged(eq(sut), any(), any());
   }
 
   @Test
@@ -112,9 +112,9 @@ public void shouldNotCallListenersIfClearIsCalled() {
 
     sut.set(newValue);
 
-    verify(listener1, never()).onValueChanged(eq(sut), anyObject(), anyObject());
-    verify(listener2, never()).onValueChanged(eq(sut), anyObject(), anyObject());
-    verify(listener3, never()).onValueChanged(eq(sut), anyObject(), anyObject());
+    verify(listener1, never()).onValueChanged(eq(sut), any(), any());
+    verify(listener2, never()).onValueChanged(eq(sut), any(), any());
+    verify(listener3, never()).onValueChanged(eq(sut), any(), any());
   }
 
   @Test

common/src/wear/java/org/runnerup/wear/WearableClient.java

@@ -4,7 +4,11 @@
 
 import android.content.Context;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
 import com.google.android.gms.tasks.OnCompleteListener;
 import com.google.android.gms.tasks.Task;
 import com.google.android.gms.wearable.DataClient;
@@ -24,28 +28,29 @@ public WearableClient(Context context) {
   }
 
   public void readData(String path, Consumer<DataItem> consumer) {
-    mDataClient.getDataItems(new Uri.Builder()
-                             .scheme(WEAR_URI_SCHEME)
-                             .path(path)
-                             .build())
-        .addOnCompleteListener(new OnCompleteListener<DataItemBuffer>() {
-            @Override
-            public void onComplete(Task<DataItemBuffer> task) {
-              if (task.isSuccessful()) {
-                DataItemBuffer dataItems = task.getResult();
-                if (dataItems.getCount() == 0) {
-                  consumer.accept(null);
-                } else {
-                  for (DataItem dataItem : dataItems) {
-                    consumer.accept(dataItem);
+    mDataClient
+        .getDataItems(new Uri.Builder().scheme(WEAR_URI_SCHEME).path(path).build())
+        .addOnCompleteListener(
+            new OnCompleteListener<DataItemBuffer>() {
+              @Override
+              public void onComplete(@NonNull Task<DataItemBuffer> task) {
+                if (task.isSuccessful()) {
+                  DataItemBuffer dataItems = task.getResult();
+                  if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                    if (dataItems.getCount() == 0) {
+                      consumer.accept(null);
+                    } else {
+                      for (DataItem dataItem : dataItems) {
+                        consumer.accept(dataItem);
+                      }
+                    }
                   }
+                  dataItems.release();
+                } else {
+                  System.out.println("task.getException(): " + task.getException());
                 }
-                dataItems.release();
-              } else {
-                System.out.println("task.getException(): " + task.getException());
               }
-            }
-          });
+            });
   }
 
   public Task<DataItem> putData(String path) {