diff --git a/.github/snippet-bot.yml b/.github/snippet-bot.yml new file mode 100644 index 00000000..e69de29b diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 31163ebb..a15a843a 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -74,11 +74,11 @@ jobs: steps: - uses: actions/checkout@v2 - - name: set up Java 11 + - name: set up Java 17 uses: actions/setup-java@v2 with: distribution: 'adopt' - java-version: '11' + java-version: '17' - name: Uninstall NDK run: | @@ -123,5 +123,5 @@ jobs: - build-WearOS - build-Snippets - build-tutorials - steps: - - run: echo "Fail if all other steps are not successful" \ No newline at end of file + steps: + - run: echo "Fail if all other steps are not successful" diff --git a/snippets/app/build.gradle b/snippets/app/build.gradle index 31b9b336..14ccc52e 100644 --- a/snippets/app/build.gradle +++ b/snippets/app/build.gradle @@ -1,10 +1,12 @@ +// [START maps_android_secrets_gradle_plugin] plugins { + // [START_EXCLUDE] id 'com.android.application' id 'kotlin-android' - // [START maps_android_secrets_gradle_plugin] + // [END_EXCLUDE] id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' - // [END maps_android_secrets_gradle_plugin] } +// [END maps_android_secrets_gradle_plugin] android { compileSdk 33 @@ -25,7 +27,7 @@ android { } composeOptions { - kotlinCompilerExtensionVersion '1.4.2' + kotlinCompilerExtensionVersion '1.5.0' } buildFeatures { @@ -47,8 +49,8 @@ android { } } compileOptions { - sourceCompatibility JavaVersion.VERSION_1_8 - targetCompatibility JavaVersion.VERSION_1_8 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } namespace 'com.google.maps.example' } diff --git a/snippets/build.gradle b/snippets/build.gradle index 89b20089..5efb3d18 100644 --- a/snippets/build.gradle +++ b/snippets/build.gradle @@ -1,13 +1,16 @@ // [START maps_android_secrets_gradle_plugin_project_level_config] -plugins { - // [START_EXCLUDE] - id 'com.android.application' version '7.4.1' apply false - id 'org.jetbrains.kotlin.android' version '1.9.0' apply false - // [END_EXCLUDE] - id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' version '2.0.1' apply false +buildscript { + dependencies { + classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" + } } // [END maps_android_secrets_gradle_plugin_project_level_config] +plugins { + id 'com.android.application' version '8.1.0' apply false + id 'org.jetbrains.kotlin.android' version '1.9.0' apply false +} + task clean(type: Delete) { delete rootProject.buildDir } diff --git a/snippets/gradle/wrapper/gradle-wrapper.properties b/snippets/gradle/wrapper/gradle-wrapper.properties index 11fb21ba..72514b25 100644 --- a/snippets/gradle/wrapper/gradle-wrapper.properties +++ b/snippets/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Mar 21 15:55:38 PDT 2022 +#Mon Oct 16 15:40:50 PDT 2023 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists