diff --git a/.gitignore b/.gitignore index 9b753ffe..42df7566 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,7 @@ java/**/build/ android/build/ build/ common/build/ +.idea/ +*.iml +local.properties + diff --git a/android/README.md b/android/README.md index 03af7607..218bdc3a 100644 --- a/android/README.md +++ b/android/README.md @@ -17,15 +17,12 @@ Android SDK Tools: https://developer.android.com/sdk/index.html#Other Set the ANDROID_HOME environment variable to the root of the SDK. Install the following packages: -* Tools/Android SDK Build-tools (Rev. 21.1.2) -* Android 5.1 (API 22) +* Tools/Android SDK Build-tools (Rev. 29.0.2) +* Android 10 (API 29) * Extras/Android Support Library -Gradle (latest version): - https://services.gradle.org/distributions/gradle-2.3-bin.zip - -Note: Additionally you must take care to avoid having multiple versions of -Gradle on your path, as this can cause problems. +Note: It is recommended to always use the included [Gradle Wrapper Scripts] to invoke Gradle to +avoid issues which may be caused by having multiple versions of Gradle on your PATH. ## Building and Running @@ -33,16 +30,16 @@ Gradle on your path, as this can cause problems. After installing all the prerequisites, check that everything is working by running: -$ gradle build +`$ gradlew build` With an Android emulator running or an Android device connected, the following command line then builds the library and runs the tests: -$ gradle connectedAndroidTest +`$ gradlew connectedAndroidTest` The test runner logs to the system log, which can be viewed using logcat: -$ adb logcat +`$ adb logcat` # Integrating with Android Apps @@ -72,7 +69,7 @@ $ adb logcat i. In activity_main.xml add: - ``` + ```xml - - diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml index e4b72013..ded2d5ad 100644 --- a/android/src/main/AndroidManifest.xml +++ b/android/src/main/AndroidManifest.xml @@ -3,9 +3,4 @@ android:versionCode="1" android:versionName="1.0" > - - - diff --git a/build.gradle b/build.gradle index b63b0b72..a128ce7d 100644 --- a/build.gradle +++ b/build.gradle @@ -17,9 +17,19 @@ /* * Root Gradle file for Java address input widget (under "common" and "android") */ +buildscript { + repositories { + google() + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:3.6.2' + } +} + allprojects { repositories { - mavenCentral() - mavenLocal() + jcenter() + google() } } diff --git a/common/README.md b/common/README.md index 1e58ecd6..2930d29f 100644 --- a/common/README.md +++ b/common/README.md @@ -10,11 +10,16 @@ http://www.gradle.org/ ## Prerequisite dependencies for using Gradle -Gradle (latest version): - https://services.gradle.org/distributions/gradle-2.3-bin.zip +The only prerequisite is a compatible Java Development Kit correctly installed, +with java, javac, and related commands available in your PATH environment. -Note: Additionally you must take care to avoid having multiple versions of -Gradle on your path, as this can cause problems. +This project makes use of the [Gradle Wrapper Scripts] to ensure repeatable builds and use of the +same Gradle version across contributors. Depending on your operating system, Gradle can be invoked +from the root project directory by using either the `gradlew` or `gradlew.bat` command from your +preferred shell environment. + +Note: It is recommended to always use the included wrapper scripts to invoke Gradle to +avoid issues which may be caused by having multiple versions of Gradle on your PATH. ## Building and Running @@ -22,5 +27,12 @@ Gradle on your path, as this can cause problems. After installing all the prerequisites, check that everything is working by running: -$ gradle build -$ gradle test +##### On Linux / Unix / Mac +`$ gradlew build` +`$ gradlew test` + +##### On Windows +`$ gradlew.bat build` +`$ gradlew.bat test` + +[Gradle Wrapper Scripts]: https://docs.gradle.org/current/userguide/gradle_wrapper.html#sec:using_wrapper \ No newline at end of file diff --git a/common/build.gradle b/common/build.gradle index 75e37627..2791a00f 100644 --- a/common/build.gradle +++ b/common/build.gradle @@ -14,23 +14,14 @@ * limitations under the License. */ -buildscript { - repositories { - mavenCentral() - mavenLocal() - } - dependencies { - classpath 'com.android.tools.build:gradle:1.1.0' - } -} - apply plugin: 'java' -sourceCompatibility = '1.7' -targetCompatibility = '1.7' +sourceCompatibility = JavaVersion.VERSION_1_7 +targetCompatibility = JavaVersion.VERSION_1_7 tasks.withType(JavaCompile) { options.encoding = 'UTF-8' + options.compilerArgs += ["-Xlint:deprecation", "-Xlint:unchecked"] } sourceSets { @@ -56,12 +47,12 @@ test { } dependencies { - compile 'com.google.guava:guava-gwt:18.0' + implementation 'com.google.guava:guava:29.0-android' /* Note that gradle will warn about this not being the same version as * * the Android JSON library (but will not compile if it's removed). */ - compile 'org.json:json:20090211' - testCompile 'junit:junit:4.11' - testCompile 'com.google.truth:truth:0.25' - testCompile 'org.mockito:mockito-core:1.9.5' + implementation 'org.json:json:20190722' + testImplementation 'junit:junit:4.13' + testImplementation 'com.google.truth:truth:1.0.1' + testImplementation 'org.mockito:mockito-core:3.3.0' } diff --git a/common/src/test/java/com/google/i18n/addressinput/common/CacheDataTest.java b/common/src/test/java/com/google/i18n/addressinput/common/CacheDataTest.java index 639a3929..3c23eb87 100644 --- a/common/src/test/java/com/google/i18n/addressinput/common/CacheDataTest.java +++ b/common/src/test/java/com/google/i18n/addressinput/common/CacheDataTest.java @@ -274,6 +274,7 @@ public void dataLoadingEnd() { assertListenerWasCalled(mockListener); } + @Test public void testSetUrl() { LookupKey key = new LookupKey.Builder(CANADA_KEY).build(); String url = "http://some-random-url"; diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..289b49d7 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,6 @@ +# AndroidX package structure to make it clearer which packages are bundled with the +# Android operating system, and which are packaged with your app's APK +# https://developer.android.com/topic/libraries/support-library/androidx-rn +android.useAndroidX=true +# Automatically convert third-party libraries to use AndroidX +android.enableJetifier=true \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 00000000..f3d88b1c Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 00000000..55d9c5c4 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Apr 14 01:10:56 EAT 2020 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStorePath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew new file mode 100644 index 00000000..2fe81a7d --- /dev/null +++ b/gradlew @@ -0,0 +1,183 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or 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 +## +############################################################################## + +# 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 +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$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='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# 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 + ;; +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" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + 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 +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 +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 + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; 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\"" + fi + i=`expr $i + 1` + 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" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 00000000..9618d8d9 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,100 @@ +@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 +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@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="-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 + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +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% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega