Merge branch 'master' into tomandersen/dbToken

Author: tom-andersen

health-metrics/apk-size/apk-size.gradle

@@ -20,12 +20,12 @@ buildscript {
 
  }
  dependencies {
- classpath 'com.android.tools.build:gradle:4.2.0'
+ classpath 'com.android.tools.build:gradle:8.2.2'
  }
 }
 
 plugins {
- id "com.dorongold.task-tree" version "1.5"
+ id "com.dorongold.task-tree" version "3.0.0"
 }
 
 apply from: '../../sdkProperties.gradle'

health-metrics/apk-size/app/build.gradle

@@ -16,8 +16,8 @@ apply plugin: "com.android.application"
 apply from: "default.gradle"
 android {
  flavorDimensions "firebase", "abi"
-
  // https://developer.android.com/ndk/guides/abis
+ namespace "com.google.apksize"
  productFlavors {
  "universal" {
  dimension "abi"

health-metrics/apk-size/app/default.gradle

@@ -25,7 +25,7 @@ android {
  abortOnError false
  checkReleaseBuilds false
  }
- compileSdk 33
+ compileSdk 34
 
  defaultConfig {
  applicationId 'com.google.apksize'
@@ -61,4 +61,5 @@ android {
 
 dependencies {
  implementation fileTree(dir: 'libs', include: ['*.jar'])
+ implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.22"))
 }

health-metrics/apk-size/gradle/wrapper/gradle-wrapper.jar

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

health-metrics/apk-size/gradle/wrapper/gradle-wrapper.properties

@@ -18,7 +18,7 @@ plugins {
  id 'com.android.test' version '7.2.2' apply false
  id 'org.jetbrains.kotlin.android' version '1.8.22' apply false
 
- id 'com.google.gms.google-services' version '4.3.13' apply false
+ id 'com.google.gms.google-services' version '4.3.15' apply false
  id 'com.google.firebase.crashlytics' version '2.9.1' apply false
  id 'com.google.firebase.firebase-perf' version '1.4.1' apply false
 }