diff --git a/map-sample/app/build.gradle b/map-sample/app/build.gradle index a6ff39a..8351a4d 100755 --- a/map-sample/app/build.gradle +++ b/map-sample/app/build.gradle @@ -16,20 +16,19 @@ apply plugin: 'com.android.application' apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' -apply plugin: 'org.jetbrains.kotlin.android' ext { - androidxLifecycleVersion = "2.6.2" + androidxLifecycleVersion = "2.10.0" glideVersion = "4.13.2" - navSdkVersion = "7.9.0" + navSdkVersion = "8.0.0" } android { - namespace 'com.example.mapdemo' - compileSdk 36 + namespace = 'com.example.mapdemo' + compileSdk 37 buildFeatures { - buildConfig true + buildConfig = true } defaultConfig { @@ -38,7 +37,7 @@ android { minSdkVersion 24 // This example targets SDK 30 so that there's no need to explicitly include permissions // flows in the app. - targetSdkVersion 36 + targetSdkVersion 37 versionCode 1 versionName "1.0" // Set this to the languages you actually use, otherwise you'll include resource strings @@ -47,11 +46,6 @@ android { multiDexEnabled true } - dexOptions { - // This increases the amount of memory available to the dexer. This is required to build - // apps using the Navigation SDK. - javaMaxHeapSize "4g" - } buildTypes { // Run proguard. Note that the Navigation SDK includes its own proguard config, and that // will be included transitively by depending on the Navigation SDK. @@ -59,18 +53,20 @@ android { // instead. all { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt') } } compileOptions { // Flag to enable support for the new language APIs - coreLibraryDesugaringEnabled true + coreLibraryDesugaringEnabled = true sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } +} - kotlinOptions { - jvmTarget = "11" +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } @@ -84,7 +80,7 @@ dependencies { // Add: android.useDeprecatedNdk=true // to local.properties. - api "org.chromium.net:cronet-fallback:119.6045.31" + api "org.chromium.net:cronet-fallback:143.7445.0" // Optional for Cronet users: // api "org.chromium.net:cronet-api:69.3497.100" @@ -95,31 +91,30 @@ dependencies { // And dependencies. api "androidx.appcompat:appcompat:1.7.1" api "androidx.cardview:cardview:1.0.0" - api "androidx.constraintlayout:constraintlayout:2.1.4" - api "androidx.customview:customview:1.1.0" + api "androidx.constraintlayout:constraintlayout:2.2.1" + api "androidx.customview:customview:1.2.0" api "androidx.legacy:legacy-support-v4:1.0.0" api "androidx.lifecycle:lifecycle-common-java8:${androidxLifecycleVersion}" api "androidx.lifecycle:lifecycle-process:${androidxLifecycleVersion}" - api "androidx.mediarouter:mediarouter:1.4.0" + api "androidx.mediarouter:mediarouter:1.8.1" api "androidx.preference:preference:1.2.1" - api "androidx.recyclerview:recyclerview:1.3.1" - api "androidx.transition:transition:1.5.1" - api "androidx.viewpager2:viewpager2:1.0.0" - api "androidx.window:window:1.1.0" + api "androidx.recyclerview:recyclerview:1.4.0" + api "androidx.transition:transition:1.7.0" + api "androidx.viewpager2:viewpager2:1.1.0" + api "androidx.window:window:1.5.1" api "com.github.bumptech.glide:glide:${glideVersion}" - api "com.google.android.datatransport:transport-api:3.0.0" - api "com.google.android.datatransport:transport-backend-cct:3.1.4" - api "com.google.android.datatransport:transport-runtime:3.1.4" + api "com.google.android.datatransport:transport-api:4.1.1" + api "com.google.android.datatransport:transport-backend-cct:4.1.1" + api "com.google.android.datatransport:transport-runtime:4.1.1" api "com.google.auto.value:auto-value-annotations:1.6.2" annotationProcessor "com.google.auto.value:auto-value:1.6.2" api 'com.google.errorprone:error_prone_annotations:2.11.0' api 'com.google.guava:guava:31.0.1-android' api "joda-time:joda-time:2.10.14" - api "com.google.android.material:material:1.12.0" - api 'org.jetbrains.kotlin:kotlin-reflect:2.1.10' + api "com.google.android.material:material:1.14.0" api 'org.jetbrains.kotlin:kotlin-stdlib:2.3.0' - annotationProcessor "androidx.annotation:annotation:1.7.0" + annotationProcessor "androidx.annotation:annotation:1.10.0" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5' @@ -130,5 +125,5 @@ secrets { // 1. Open the root project's local.properties file // 2. Add this line, where YOUR_API_KEY is your API key: // MAPS_API_KEY=YOUR_API_KEY - defaultPropertiesFileName 'local.defaults.properties' + defaultPropertiesFileName = 'local.defaults.properties' } diff --git a/map-sample/app/src/main/AndroidManifest.xml b/map-sample/app/src/main/AndroidManifest.xml index 11c9585..4ce8a54 100644 --- a/map-sample/app/src/main/AndroidManifest.xml +++ b/map-sample/app/src/main/AndroidManifest.xml @@ -16,7 +16,6 @@ --> diff --git a/map-sample/build.gradle b/map-sample/build.gradle index 05026aa..30bf5d9 100755 --- a/map-sample/build.gradle +++ b/map-sample/build.gradle @@ -22,7 +22,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.2.0' classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" // NOTE: Do not place your application dependencies here; they belong diff --git a/map-sample/gradle/wrapper/gradle-wrapper.properties b/map-sample/gradle/wrapper/gradle-wrapper.properties index 37f853b..c61a118 100755 --- a/map-sample/gradle/wrapper/gradle-wrapper.properties +++ b/map-sample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/navigation-sample/app/build.gradle b/navigation-sample/app/build.gradle index 6d32458..cb3c6d5 100644 --- a/navigation-sample/app/build.gradle +++ b/navigation-sample/app/build.gradle @@ -15,28 +15,27 @@ */ apply plugin: 'com.android.application' -apply plugin: 'org.jetbrains.kotlin.android' apply plugin: 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' ext { - androidxLifecycleVersion = "2.6.2" + androidxLifecycleVersion = "2.10.0" glideVersion = "4.13.2" - navSdkVersion = "7.9.0" + navSdkVersion = "8.0.0" } android { - namespace 'com.example.navigationapidemo' - compileSdk 36 + namespace = 'com.example.navigationapidemo' + compileSdk 37 buildFeatures { - buildConfig true + buildConfig = true } defaultConfig { applicationId "com.example.navigationapidemo" // Navigation SDK supports a minimum of SDK 24. minSdkVersion 24 - targetSdkVersion 36 + targetSdkVersion 37 versionCode 1 versionName "1.0" // Set this to the languages you actually use, otherwise you'll include resource strings @@ -44,11 +43,6 @@ android { resConfigs "en" } - dexOptions { - // This increases the amount of memory available to the dexer. This is required to build - // apps using the Navigation SDK. - javaMaxHeapSize "4g" - } buildTypes { // Run proguard. Note that the Navigation SDK includes its own proguard config, and that // will be included transitively by depending on the Navigation SDK. @@ -56,18 +50,20 @@ android { // instead. all { minifyEnabled true - proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } compileOptions { - coreLibraryDesugaringEnabled true + coreLibraryDesugaringEnabled = true sourceCompatibility JavaVersion.VERSION_11 targetCompatibility JavaVersion.VERSION_11 } +} - kotlinOptions { - jvmTarget = "11" +kotlin { + compilerOptions { + jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_11) } } @@ -84,7 +80,7 @@ dependencies { // Add: android.useDeprecatedNdk=true // to local.properties. - api "org.chromium.net:cronet-fallback:119.6045.31" + api "org.chromium.net:cronet-fallback:143.7445.0" // Optional for Cronet users: // api "org.chromium.net:cronet-api:69.3497.100" @@ -95,32 +91,31 @@ dependencies { // And dependencies. api "androidx.appcompat:appcompat:1.7.1" api "androidx.cardview:cardview:1.0.0" - api "androidx.constraintlayout:constraintlayout:2.1.4" - api "androidx.customview:customview:1.1.0" + api "androidx.constraintlayout:constraintlayout:2.2.1" + api "androidx.customview:customview:1.2.0" api "androidx.legacy:legacy-support-v4:1.0.0" api "androidx.lifecycle:lifecycle-common-java8:${androidxLifecycleVersion}" api "androidx.lifecycle:lifecycle-process:${androidxLifecycleVersion}" - api "androidx.mediarouter:mediarouter:1.4.0" + api "androidx.mediarouter:mediarouter:1.8.1" api "androidx.preference:preference:1.2.1" - api "androidx.recyclerview:recyclerview:1.3.1" - api "androidx.tracing:tracing:1.1.0" - api "androidx.transition:transition:1.5.1" - api "androidx.viewpager2:viewpager2:1.0.0" - api "androidx.window:window:1.1.0" + api "androidx.recyclerview:recyclerview:1.4.0" + api "androidx.tracing:tracing:1.3.0" + api "androidx.transition:transition:1.7.0" + api "androidx.viewpager2:viewpager2:1.1.0" + api "androidx.window:window:1.5.1" api "com.github.bumptech.glide:glide:${glideVersion}" - api "com.google.android.datatransport:transport-api:3.0.0" - api "com.google.android.datatransport:transport-backend-cct:3.1.4" - api "com.google.android.datatransport:transport-runtime:3.1.4" + api "com.google.android.datatransport:transport-api:4.1.1" + api "com.google.android.datatransport:transport-backend-cct:4.1.1" + api "com.google.android.datatransport:transport-runtime:4.1.1" api "joda-time:joda-time:2.10.14" // Also include the Google Places SDK, which is used by this example, but // isn't required by the Navigation SDK. api "com.google.android.libraries.places:places:4.0.0" - api "com.google.android.material:material:1.12.0" - api 'org.jetbrains.kotlin:kotlin-reflect:2.3.0' + api "com.google.android.material:material:1.14.0" api 'org.jetbrains.kotlin:kotlin-stdlib:2.3.0' api 'com.google.guava:guava:31.0.1-android' - annotationProcessor "androidx.annotation:annotation:1.7.0" + annotationProcessor "androidx.annotation:annotation:1.10.0" annotationProcessor "com.github.bumptech.glide:compiler:${glideVersion}" coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.5' } @@ -130,5 +125,5 @@ secrets { // 1. Open the root project's local.properties file // 2. Add this line, where YOUR_API_KEY is your API key: // MAPS_API_KEY=YOUR_API_KEY - defaultPropertiesFileName 'local.defaults.properties' + defaultPropertiesFileName = 'local.defaults.properties' } diff --git a/navigation-sample/app/src/main/AndroidManifest.xml b/navigation-sample/app/src/main/AndroidManifest.xml index e2e9f46..aac784f 100755 --- a/navigation-sample/app/src/main/AndroidManifest.xml +++ b/navigation-sample/app/src/main/AndroidManifest.xml @@ -16,8 +16,7 @@ --> + xmlns:tools="http://schemas.android.com/tools"> diff --git a/navigation-sample/build.gradle b/navigation-sample/build.gradle index 05026aa..30bf5d9 100755 --- a/navigation-sample/build.gradle +++ b/navigation-sample/build.gradle @@ -22,7 +22,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:8.13.2' + classpath 'com.android.tools.build:gradle:9.2.0' classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" // NOTE: Do not place your application dependencies here; they belong diff --git a/navigation-sample/gradle/wrapper/gradle-wrapper.properties b/navigation-sample/gradle/wrapper/gradle-wrapper.properties index 37f853b..c61a118 100755 --- a/navigation-sample/gradle/wrapper/gradle-wrapper.properties +++ b/navigation-sample/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-9.4.1-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME