diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml index a367d23e..46c9b456 100644 --- a/.github/workflows/docs.yml +++ b/.github/workflows/docs.yml @@ -39,12 +39,10 @@ jobs: echo "Creating tar for generated docs" cd $GITHUB_WORKSPACE/maps-utils-ktx/build/documentation && tar cvf ~/maps-utils-docs.tar . cd $GITHUB_WORKSPACE/maps-ktx/build/documentation && tar cvf ~/maps-docs.tar . - cd $GITHUB_WORKSPACE/maps-v3-ktx/build/documentation && tar cvf ~/maps-v3-docs.tar . - cd $GITHUB_WORKSPACE/maps-utils-v3-ktx/build/documentation && tar cvf ~/maps-utils-v3-docs.tar . echo "Unpacking tar into gh-pages branch" git fetch --no-tags --prune --depth=1 origin +refs/heads/*:refs/remotes/origin/* - cd $GITHUB_WORKSPACE && git checkout gh-pages && tar xvf ~/maps-docs.tar && tar xvf ~/maps-utils-docs.tar && tar xvf ~/maps-v3-docs.tar && tar xvf ~/maps-utils-v3-docs.tar + cd $GITHUB_WORKSPACE && git checkout gh-pages && tar xvf ~/maps-docs.tar && tar xvf ~/maps-utils-docs.tar # Commit changes and create a PR - name: PR Changes diff --git a/README.md b/README.md index efc3b51b..93b764eb 100644 --- a/README.md +++ b/README.md @@ -30,29 +30,6 @@ dependencies { // KTX for the Maps SDK for Android Utility Library implementation 'com.google.maps.android:maps-utils-ktx:3.4.0' - - // It is recommended to also include the latest Maps SDK and/or Utility Library versions - // as well to ensure that you have the latest features and bug fixes. - implementation 'com.google.android.gms:play-services-maps:' - implementation 'com.google.maps.android:android-maps-utils:' -} -``` - -(**Deprecated**) ~Alternatively, if you are using the Maps SDK through the standalone V3 BETA distribution:~ - -```groovy -dependencies { - - // KTX for the Maps SDK for Android V3 BETA Library - implementation 'com.google.maps.android:maps-v3-ktx:3.4.0' - - // KTX for the Maps SDK for Android V3 BETA Utility Library - implementation 'com.google.maps.android:maps-utils-v3-ktx:3.4.0' - - // It is recommended to also include the latest Maps SDK and/or Utility Library versions - // as well to ensure that you have the latest features and bug fixes. - implementation 'com.google.android.libraries.maps:maps:3.4.0-beta' - implementation 'com.google.maps.android:android-maps-utils-v3:' } ``` diff --git a/app/build.gradle b/app/build.gradle index b44880ff..046dd7e5 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google Inc. + * Copyright 2023 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,11 @@ plugins { id 'com.android.application' id 'kotlin-android' - id 'com.google.android.secrets-gradle-plugin' version '1.1.0' + id 'com.google.android.libraries.mapsplatform.secrets-gradle-plugin' } android { - compileSdkVersion versions.android.compileSdk - buildToolsVersion versions.android.buildTools + compileSdk versions.android.compileSdk defaultConfig { applicationId "com.google.maps.android.ktx.demo" @@ -47,6 +46,7 @@ android { kotlinOptions { jvmTarget = "1.8" } + namespace 'com.google.maps.android.ktx.demo' } // [START maps_android_utils_ktx_install_snippet] @@ -58,7 +58,7 @@ dependencies { implementation deps.androidx.coreKtx implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' implementation 'com.google.android.gms:play-services-maps:18.1.0' -// implementation 'com.google.maps.android:maps-ktx:3.0.1' + // implementation 'com.google.maps.android:maps-ktx:3.4.0' implementation project(':maps-ktx') // implementation project(':maps-utils-ktx') // [END_EXCLUDE] diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 85ea2d74..2712d803 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + + android:label="@string/app_name" + android:exported="true"> diff --git a/build.gradle b/build.gradle index f2ef4a8f..374334da 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ /** - * Copyright 2020 Google Inc. + * Copyright 2023 Google Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,12 +17,12 @@ buildscript { ext.versions = [ 'android' : [ - "buildTools": "29.0.3", - "compileSdk": 31, + "buildTools": "30.0.3", + "compileSdk": 34, "minSdk" : 19, - "targetSdk" : 31 + "targetSdk" : 34 ], - 'androidMapsUtils' : '2.2.3', + 'androidMapsUtils' : '3.5.3', 'androidx' : [ 'appcompat': '1.1.0', 'coreKtx' : '1.2.0', @@ -31,19 +31,17 @@ buildscript { 'junit' : '1.1.1', ], 'junit' : '4.12', - 'kotlin' : '1.6.10', + 'kotlin' : '1.8.21', 'kotlinxCoroutines': '1.6.0', - 'mapsBeta' : '3.1.0-beta', 'mockito' : '3.0.0', 'mockitoKotlin' : '2.2.0', - 'playServices' : '18.0.0', + 'playServices' : '18.1.0', 'volley' : '1.2.0', ] ext.deps = [ 'androidMapsUtils' : [ - 'gms': "com.google.maps.android:android-maps-utils:$versions.androidMapsUtils", - 'v3' : "com.google.maps.android:android-maps-utils-v3:$versions.androidMapsUtils" + 'gms': "com.google.maps.android:android-maps-utils:$versions.androidMapsUtils" ], 'androidx' : [ 'appcompat': "androidx.appcompat:appcompat:$versions.androidx.appcompat", @@ -65,23 +63,22 @@ buildscript { ] repositories { + gradlePluginPortal() google() mavenCentral() - maven { url "https://plugins.gradle.org/m2/" } } dependencies { - classpath 'com.android.tools.build:gradle:4.1.3' - classpath 'org.jetbrains.dokka:dokka-gradle-plugin:0.10.1' + classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'org.jetbrains.dokka:dokka-gradle-plugin:1.9.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin" classpath 'com.hiya:jacoco-android:0.2' + classpath "com.google.android.libraries.mapsplatform.secrets-gradle-plugin:secrets-gradle-plugin:2.0.1" } } ext.projectArtifactId = { project -> if (project.name == 'maps-utils-ktx' || - project.name == 'maps-ktx' || - project.name == 'maps-v3-ktx' || - project.name == 'maps-utils-v3-ktx') { + project.name == 'maps-ktx') { return project.name } else { return null @@ -118,15 +115,16 @@ subprojects { project -> apply plugin: 'signing' // Documentation - dokka { - outputFormat = 'html' - outputDirectory = "$buildDir/documentation" - configuration { - includeNonPublic = false - skipEmptyPackages = true - skipDeprecated = true - reportUndocumented = true - jdkVersion = 8 + tasks.named("dokkaHtml") { + outputDirectory.set(file("${buildDir}/documentation")) + dokkaSourceSets { + configureEach { + skipDeprecated.set(true) + jdkVersion.set(8) + skipEmptyPackages.set(true) + reportUndocumented.set(true) + displayName.set("JVM") + } } } @@ -135,18 +133,20 @@ subprojects { project -> toolVersion = "0.8.7" } - tasks.withType(Test) { + + tasks.withType(Test).configureEach { jacoco.includeNoLocationClasses = true jacoco.excludes = ['jdk.internal.*'] } - task sourcesJar(type: Jar) { + tasks.register('sourcesJar', Jar) { from android.sourceSets.main.java.source archiveClassifier = "sources" } - task dokkaJar(type: Jar, dependsOn: dokka) { - from dokka.outputDirectory + tasks.register('dokkaJar', Jar) { + dependsOn dokkaHtml + from dokkaHtml.outputDirectory archiveClassifier = "javadoc" } @@ -223,30 +223,7 @@ subprojects { project -> } -task clean(type: Delete) { +tasks.register('clean', Delete) { delete rootProject.buildDir } -/** - * This task will copy all of the source code in this module into the `maps-v3-ktx` module - * and change its imports from the Maps SDK on Play Services to the Standalone V3 Beta Maps SDK. - */ -task copyGmsToV3Beta(type: Copy) { - from 'maps-ktx/src' - into 'maps-v3-ktx/src' - filter { line -> - line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps') - } -} - -/** - * This task will copy all of the source code in this module into the `maps-v3-ktx` module - * and change its imports from the Maps SDK on Play Services to the Standalone V3 Beta Maps SDK. - */ -task copyGmsUtilsToV3Beta(type: Copy) { - from 'maps-utils-ktx/src' - into 'maps-utils-v3-ktx/src' - filter { line -> - line.replace('com.google.android.gms.maps', 'com.google.android.libraries.maps') - } -} diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index f6b961fd..7454180f 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index adcc81df..9582453b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Wed Jan 27 13:34:12 PST 2021 +#Fri Sep 15 07:45:22 CEST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip diff --git a/gradlew b/gradlew index cccdd3d5..1b6c7873 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS="" +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,95 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index e95643d6..ac1b06f9 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS= +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/maps-ktx/build.gradle b/maps-ktx/build.gradle index b0268f0e..2bae3999 100644 --- a/maps-ktx/build.gradle +++ b/maps-ktx/build.gradle @@ -17,11 +17,9 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion versions.android.compileSdk - buildToolsVersion versions.android.buildTools + compileSdk versions.android.compileSdk defaultConfig { minSdkVersion versions.android.minSdk @@ -39,10 +37,12 @@ android { freeCompilerArgs += '-Xexplicit-api=strict' jvmTarget = "1.8" } + buildFeatures { + viewBinding true + } + namespace 'com.google.maps.android.ktx' } -preBuild.dependsOn(rootProject.tasks.copyGmsToV3Beta) - dependencies { implementation deps.kotlin implementation deps.kotlinxCoroutines diff --git a/maps-ktx/src/main/AndroidManifest.xml b/maps-ktx/src/main/AndroidManifest.xml index 123f4356..562b2f48 100644 --- a/maps-ktx/src/main/AndroidManifest.xml +++ b/maps-ktx/src/main/AndroidManifest.xml @@ -1,5 +1,5 @@ - + diff --git a/maps-utils-ktx/build.gradle b/maps-utils-ktx/build.gradle index 0aa0bb1c..bbc1fffa 100644 --- a/maps-utils-ktx/build.gradle +++ b/maps-utils-ktx/build.gradle @@ -16,11 +16,9 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion versions.android.compileSdk - buildToolsVersion versions.android.buildTools + compileSdk versions.android.compileSdk defaultConfig { minSdkVersion versions.android.minSdk @@ -29,8 +27,10 @@ android { consumerProguardFiles 'consumer-rules.pro' } - libraryVariants.all { - it.generateBuildConfig.enabled = false + libraryVariants.configureEach { + it.generateBuildConfigProvider.configure { + it.enabled = true + } } compileOptions { @@ -42,10 +42,12 @@ android { freeCompilerArgs += '-Xexplicit-api=strict' jvmTarget = "1.8" } + buildFeatures { + viewBinding true + } + namespace 'com.google.maps.android.ktx.utils' } -preBuild.dependsOn(rootProject.tasks.copyGmsUtilsToV3Beta) - dependencies { implementation deps.kotlin api deps.androidMapsUtils.gms diff --git a/maps-utils-ktx/src/main/AndroidManifest.xml b/maps-utils-ktx/src/main/AndroidManifest.xml index 8895bfc2..94cbbcfc 100644 --- a/maps-utils-ktx/src/main/AndroidManifest.xml +++ b/maps-utils-ktx/src/main/AndroidManifest.xml @@ -1,2 +1 @@ - + diff --git a/maps-utils-v3-ktx/.gitignore b/maps-utils-v3-ktx/.gitignore deleted file mode 100644 index eba6c0d4..00000000 --- a/maps-utils-v3-ktx/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build -src/main/java/* -src/test/* diff --git a/maps-utils-v3-ktx/README.md b/maps-utils-v3-ktx/README.md deleted file mode 100644 index d94189b0..00000000 --- a/maps-utils-v3-ktx/README.md +++ /dev/null @@ -1,8 +0,0 @@ -maps-utils-v3-ktx -================= - -This module contains Kotlin extensions (KTX) for the Maps SDK Utility V3 BETA library for Android. - -**NOTE**: The source code in this module is autogenerated from source code within the `maps-utils-ktx` -module (on `maps-utils-ktx` compilation) and is not intended for modifications. Please make any code -changes in the `maps-utils-ktx` module. diff --git a/maps-utils-v3-ktx/build.gradle b/maps-utils-v3-ktx/build.gradle deleted file mode 100644 index 6fed0d4c..00000000 --- a/maps-utils-v3-ktx/build.gradle +++ /dev/null @@ -1,60 +0,0 @@ -/** - * Copyright 2020 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion versions.android.compileSdk - buildToolsVersion versions.android.buildTools - - defaultConfig { - minSdkVersion versions.android.minSdk - targetSdkVersion versions.android.targetSdk - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - libraryVariants.all { - it.generateBuildConfig.enabled = false - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - freeCompilerArgs += '-Xexplicit-api=strict' - jvmTarget = "1.8" - } -} - -dependencies { - implementation deps.kotlin - implementation deps.kotlinxCoroutines - implementation deps.volley - api deps.androidMapsUtils.v3 - api deps.mapsBeta - - // Tests - testImplementation deps.androidx.test - testImplementation deps.androidx.junit - testImplementation deps.junit - testImplementation deps.mockito - testImplementation deps.mockitoKotlin -} diff --git a/maps-utils-v3-ktx/consumer-rules.pro b/maps-utils-v3-ktx/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/maps-utils-v3-ktx/proguard-rules.pro b/maps-utils-v3-ktx/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/maps-utils-v3-ktx/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/maps-utils-v3-ktx/src/main/AndroidManifest.xml b/maps-utils-v3-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index 8895bfc2..00000000 --- a/maps-utils-v3-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1,2 +0,0 @@ - diff --git a/maps-v3-ktx/.gitignore b/maps-v3-ktx/.gitignore deleted file mode 100644 index eba6c0d4..00000000 --- a/maps-v3-ktx/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -/build -src/main/java/* -src/test/* diff --git a/maps-v3-ktx/README.md b/maps-v3-ktx/README.md deleted file mode 100644 index c4a7749f..00000000 --- a/maps-v3-ktx/README.md +++ /dev/null @@ -1,8 +0,0 @@ -maps-v3-ktx -=========== - -This module contains Kotlin extensions (KTX) for the Maps SDK V3 BETA library for Android. - -**NOTE**: The source code in this module is autogenerated from source code within the `maps-ktx` -module (on `maps-ktx` compilation) and is not intended for modifications. Please make any code -changes in the `maps-ktx` module. diff --git a/maps-v3-ktx/build.gradle b/maps-v3-ktx/build.gradle deleted file mode 100644 index 27cd302a..00000000 --- a/maps-v3-ktx/build.gradle +++ /dev/null @@ -1,56 +0,0 @@ -/* - * Copyright 2020 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -apply plugin: 'com.android.library' -apply plugin: 'kotlin-android' -apply plugin: 'kotlin-android-extensions' - -android { - compileSdkVersion versions.android.compileSdk - buildToolsVersion versions.android.buildTools - - defaultConfig { - minSdkVersion versions.android.minSdk - targetSdkVersion versions.android.targetSdk - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - compileOptions { - sourceCompatibility = JavaVersion.VERSION_1_8 - targetCompatibility = JavaVersion.VERSION_1_8 - } - - kotlinOptions { - freeCompilerArgs += '-Xexplicit-api=strict' - jvmTarget = "1.8" - } -} - -dependencies { - implementation deps.kotlin - implementation deps.kotlinxCoroutines - implementation deps.volley - api deps.mapsBeta - - // Tests - testImplementation deps.androidx.test - testImplementation deps.androidx.junit - testImplementation deps.junit - testImplementation deps.mockito - testImplementation deps.mockitoKotlin -} diff --git a/maps-v3-ktx/consumer-rules.pro b/maps-v3-ktx/consumer-rules.pro deleted file mode 100644 index e69de29b..00000000 diff --git a/maps-v3-ktx/proguard-rules.pro b/maps-v3-ktx/proguard-rules.pro deleted file mode 100644 index f1b42451..00000000 --- a/maps-v3-ktx/proguard-rules.pro +++ /dev/null @@ -1,21 +0,0 @@ -# Add project specific ProGuard rules here. -# You can control the set of applied configuration files using the -# proguardFiles setting in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} - -# Uncomment this to preserve the line number information for -# debugging stack traces. -#-keepattributes SourceFile,LineNumberTable - -# If you keep the line number information, uncomment this to -# hide the original source file name. -#-renamesourcefileattribute SourceFile diff --git a/maps-v3-ktx/src/main/AndroidManifest.xml b/maps-v3-ktx/src/main/AndroidManifest.xml deleted file mode 100644 index 123f4356..00000000 --- a/maps-v3-ktx/src/main/AndroidManifest.xml +++ /dev/null @@ -1,18 +0,0 @@ - - diff --git a/secure.defaults.properties b/secure.defaults.properties index 9e0d438a..0cf3fd73 100644 --- a/secure.defaults.properties +++ b/secure.defaults.properties @@ -1 +1 @@ -MAPS_API_KEY="" +MAPS_API_KEY="YOUR_MAPS_API_KEY" diff --git a/settings.gradle b/settings.gradle index e78758c6..5550cf28 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,6 +1,4 @@ include ':app' include ':maps-ktx' include ':maps-utils-ktx' -include ':maps-v3-ktx' rootProject.name='android-maps-ktx' -include ':maps-utils-v3-ktx'