google · andrew12678 · May 4, 2024 · May 15, 2024
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,5 @@ java/**/build/
 android/build/
 build/
 common/build/
+.idea/
+local.properties
diff --git a/android/README.md b/android/README.md
@@ -2,47 +2,42 @@
 
 
 The easiest way to build libaddressinput for Android and run all the tests is
-using the Gradle project automation tool:
+to use Gradle:
 
-http://tools.android.com/tech-docs/new-build-system
+https://developer.android.com/build
 http://www.gradle.org/
 
 
 ## Prerequisite dependencies for using Gradle with Android
 
-Android Studio: https://developer.android.com/sdk/index.html
-or
-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)
-* Extras/Android Support Library
+Android Studio: https://developer.android.com/sdk/index.html (recommended)
+- Check Tools > SDK Manager.
 
-Gradle (latest version):
-  https://services.gradle.org/distributions/gradle-2.3-bin.zip
+Android SDK Tools: https://developer.android.com/sdk/index.html#Other
+- Set the ANDROID_HOME environment variable to the root of the SDK.
 
-Note: Additionally you must take care to avoid having multiple versions of
-Gradle on your path, as this can cause problems.
+Ensure the following packages are installed:
+- Tools/Android SDK Platform-tools (Rev. 35.0.1)
+- Android 14 (API 34)
+- Extras/Android Support Library
 
 
 ## Building and Running
 
 After installing all the prerequisites, check that everything is working by
-running:
+building the package and running the tests in Android Studio. Alternatively, the
+following can be run by command line:
 
-$ 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
 
@@ -54,35 +49,35 @@ $ adb logcat
 
 3. Build the widget and library via gradle:
 
-    `gradle build`
+   `gradle build`
 
 4. Copy the widget and the common libraries:
 
-    `cp android/build/outputs/aar/android-release.aar path/to/project/app/libs/`
+   `cp android/build/outputs/aar/android-release.aar path/to/project/app/libs/`
 
-    `cp common/build/libs/common.jar path/to/project/app/libs/`
+   `cp common/build/libs/common.jar path/to/project/app/libs/`
 
-    Note: Be sure top replace 'path/to/project' with the name of your project.
+   Note: Be sure top replace 'path/to/project' with the name of your project.
 
 5. Import both modules into your app.
 
-    Note: If you use Android Studio, check out the [user guide](https://developer.android.com/studio/projects/android-library.html#AddDependency) and follow the instructions under 'Add your library as a dependency'. Be sure to add *both* modules as dependencies of the app.
+   Note: If you use Android Studio, check out the [user guide](https://developer.android.com/studio/projects/android-library.html#AddDependency) and follow the instructions under 'Add your library as a dependency'. Be sure to add *both* modules as dependencies of the app.
 
 6. Add the widget to your app. Note: This Assumes a default empty project configuration:
 
-    i. In activity_main.xml add:
+   i. In activity_main.xml add:
 
-    ```
+    ```xml
     <LinearLayout
         android:id="@+id/addresswidget"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:orientation="vertical"/>
      ```
 
-    ii. In MainActivity.java add the following import statements:
+   ii. In MainActivity.java add the following import statements:
 
-    ```
+    ```java
     import android.view.ViewGroup;
 
     import com.android.i18n.addressinput.AddressWidget;
@@ -91,12 +86,14 @@ $ adb logcat
     import com.google.i18n.addressinput.common.SimpleClientCacheManager;
     ```
 
-    iii. Define the widget on the object scope
-
-        `private AddressWidget addressWidget;`
+   iii. Define the widget on the object scope
 
-    iv. Add the widget to the ViewGroup
+    ```java
+    private AddressWidget addressWidget;
     ```
+
+   iv. Add the widget to the ViewGroup
+    ```java
     ViewGroup viewGroup = (ViewGroup) findViewById(R.id.addresswidget);
     FormOptions defaultFormOptions = new FormOptions();
     ClientCacheManager cacheManager = new SimpleClientCacheManager();
@@ -105,7 +102,7 @@ $ adb logcat
 
 Example:
 
-```
+```java
 package com.example.google.widgetdemo;
 
 import android.support.v7.app.AppCompatActivity;
@@ -131,4 +128,4 @@ public class MainActivity extends AppCompatActivity {
         this.addressWidget = new AddressWidget(this, viewGroup, defaultFormOptions, cacheManager);
     }
 }
-```
+```
diff --git a/android/build.gradle b/android/build.gradle
@@ -14,53 +14,28 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-    }
-}
-
 apply plugin: 'com.android.library'
 
 tasks.withType(JavaCompile) {
     options.encoding = 'UTF-8'
 }
 
 dependencies {
-    compile project(':common')
-    compile 'com.google.android.gms:play-services-location:10.0.0'
-    compile 'com.google.android.gms:play-services-places:9.2.0'
+    api project(':common')
+    implementation 'com.google.android.gms:play-services-location:10.0.0'
+    implementation 'com.google.android.gms:play-services-places:9.2.0'
+    implementation 'com.google.guava:guava-gwt:18.0'
 }
 
 android {
     /*
-     * If these are modified, update the README to reflect the new versions and
-     * update any related settings in the AdroidManifest.xml file.
-     *
-     * NOTE: Because the 'buildToolsVersion' directive only matches an exact
-     * release (rather than allowing wildcards) and Android remove older
-     * versions of the build tools very soon after a new revision is made
-     * available, we must never use the lastest major version of the build
-     * tools here (because it will quickly be superceded and become unavailable
-     * to anyone using a fresh install of the SDK). The "final" release of the
-     * previous major version remains available for much longer however, so as
-     * a workaround we always use that.
-     *
-     * So when the build tools version 23.0.0 is released, the buildToolsVersion
-     * below should be bumped to the last released version of the 22.x.x series.
-     *
-     * The obvious way to fix this would be allow wildcards (ie, "22.+") but
-     * Android have explicitly said that they won't do this.
+     * If these are modified, update the README to reflect the new versions.
      */
-    compileSdkVersion 22
-    buildToolsVersion '21.1.2'
+    namespace "com.android.i18n.addressinput"
+    compileSdk 34
     defaultConfig {
       minSdkVersion 17
-      targetSdkVersion 22
+      targetSdkVersion 34
     }
 }
 
diff --git a/android/src/androidTest/AndroidManifest.xml b/android/src/androidTest/AndroidManifest.xml
@@ -4,10 +4,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
-
     <!-- Gradle generates an <instrumentation> block during the build process,
          but in order to work with other build systems, that don't do that,
          there must be such a block declared here. -->

diff --git a/android/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml
@@ -3,9 +3,6 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk
-        android:minSdkVersion="9"
-        android:targetSdkVersion="22" />
     <application/>
 
 </manifest>
diff --git a/build.gradle b/build.gradle
@@ -17,9 +17,21 @@
 /*
  * Root Gradle file for Java address input widget (under "common" and "android")
  */
-allprojects {
+buildscript {
   repositories {
     mavenCentral()
     mavenLocal()
+    google()
+  }
+  dependencies {
+    classpath 'com.android.tools.build:gradle:8.2.2'
   }
 }
+
+allprojects {
+  repositories {
+    mavenCentral()
+    mavenLocal()
+    google()
+  }
+}
diff --git a/common/README.md b/common/README.md
@@ -1,26 +1,26 @@
 # Building and running tests
 
-
 The common (non-UI) parts of libaddressinput are built and run using the Gradle
 project automation tool:
 
-http://tools.android.com/tech-docs/new-build-system
-http://www.gradle.org/
-
+https://developer.android.com/build http://www.gradle.org/
 
 ## Prerequisite dependencies for using Gradle
 
-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.
-
+Use Android Studio to build packages and run tests. Alternatively, make use of
+the Gradle Wrapper Scripts: `gradlew` or `gradlew.bat`.
 
 ## Building and Running
 
 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`
diff --git a/common/build.gradle b/common/build.gradle
@@ -14,22 +14,12 @@
  * limitations under the License.
  */
 
-buildscript {
-    repositories {
-        mavenCentral()
-        mavenLocal()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:1.1.0'
-    }
-}
+apply plugin: 'java-library'
 
-apply plugin: 'java'
+sourceCompatibility = JavaVersion.VERSION_11
+targetCompatibility = JavaVersion.VERSION_11
 
-sourceCompatibility = '1.7'
-targetCompatibility = '1.7'
-
-tasks.withType(JavaCompile) {
+tasks.withType(JavaCompile).configureEach {
     options.encoding = 'UTF-8'
 }
 
@@ -55,13 +45,21 @@ test {
   // }
 }
 
+repositories {
+    google()
+    mavenLocal()
+    mavenCentral()
+}
+
 dependencies {
-  compile 'com.google.guava:guava-gwt:18.0'
+  api 'com.google.errorprone:error_prone_annotations:2.18.0'
+  api 'org.jspecify:jspecify:0.2.0'
+  implementation 'com.google.guava:guava-gwt:18.0'
   /* 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:20090211'
+  testImplementation 'junit:junit:4.11'
+  testImplementation 'com.google.truth:truth:0.25'
+  testImplementation 'org.mockito:mockito-core:5.11.0'
 }
 
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,7 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
+networkTimeout=10000
+validateDistributionUrl=true
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists