Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
57 changes: 26 additions & 31 deletions map-sample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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
Expand All @@ -47,30 +46,27 @@ 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.
// If the proguard step takes too long, consider enabling multidex for development work
// 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)
}
}

Expand All @@ -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"

Expand All @@ -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'
Expand All @@ -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'
}
1 change: 0 additions & 1 deletion map-sample/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.example.mapdemo"
xmlns:tools="http://schemas.android.com/tools"
android:versionCode="1"
android:versionName="1.0">
Expand Down
2 changes: 1 addition & 1 deletion map-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion map-sample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
59 changes: 27 additions & 32 deletions navigation-sample/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -15,59 +15,55 @@
*/

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
// for all Navigation SDK supported languages.
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.
// If the proguard step takes too long, consider enabling multidex for development work
// 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)
}
}

Expand All @@ -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"

Expand All @@ -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'
}
Expand All @@ -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'
}
3 changes: 1 addition & 2 deletions navigation-sample/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.example.navigationapidemo">
xmlns:tools="http://schemas.android.com/tools">

<uses-permission android:name="android.permission.FOREGROUND_SERVICE" />

Expand Down
2 changes: 1 addition & 1 deletion navigation-sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion navigation-sample/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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
Expand Down
Loading