Skip to content

Commit b86b436

Browse files
DzmitryFomchynDzmitryFomchyn
authored
Migrate to AGP 8 (#352)
* Android Gradle Plugin 8 * Fix dependencies json ordering issue
1 parent ca65656 commit b86b436

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1137
-1049
lines changed

‎.circleci/config.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ commands:
215215
executors:
216216
default-executor:
217217
docker:
218-
- image: mbgl/android-ndk-r22:latest
218+
- image: mbgl/android-ndk-r22-jdk17-ubuntu24:latest
219219
working_directory: ~/code
220220
environment:
221221
MBX_CI_DOMAIN: o619qyc20d.execute-api.us-east-1.amazonaws.com

‎LICENSE.md‎

Lines changed: 882 additions & 882 deletions
Large diffs are not rendered by default.

‎MapboxSearch/autofill/api/api-metalava.txt‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,22 +2,23 @@
22
package com.mapbox.search.autofill {
33

44
public interface AddressAutofill {
5-
method public default static com.mapbox.search.autofill.AddressAutofill create(com.mapbox.common.location.LocationProvider? locationProvider = <anonymous class>());
6-
method public default static final com.mapbox.search.autofill.AddressAutofill create();
7-
method public suspend Object? reverse(com.mapbox.geojson.Point point, com.mapbox.search.autofill.AddressAutofillOptions options, kotlin.coroutines.Continuation<? super com.mapbox.bindgen.Expected<java.lang.Exception,java.util.List<com.mapbox.search.autofill.AddressAutofillResult>>> p);
8-
method public suspend Object? select(com.mapbox.search.autofill.AddressAutofillSuggestion suggestion, kotlin.coroutines.Continuation<? super com.mapbox.bindgen.Expected<java.lang.Exception,com.mapbox.search.autofill.AddressAutofillResult>> p);
9-
method public suspend Object? suggestions(com.mapbox.search.autofill.Query query, com.mapbox.search.autofill.AddressAutofillOptions options, kotlin.coroutines.Continuation<? super com.mapbox.bindgen.Expected<java.lang.Exception,java.util.List<com.mapbox.search.autofill.AddressAutofillSuggestion>>> p);
5+
method public default static com.mapbox.search.autofill.AddressAutofill create(com.mapbox.common.location.LocationProvider? locationProvider = defaultLocationProvider());
6+
method public default static com.mapbox.search.autofill.AddressAutofill create();
7+
method public suspend Object? reverse(com.mapbox.geojson.Point point, com.mapbox.search.autofill.AddressAutofillOptions options, kotlin.coroutines.Continuation<? super com.mapbox.bindgen.Expected<java.lang.Exception,java.util.List<? extends com.mapbox.search.autofill.AddressAutofillResult>>>);
8+
method public suspend Object? select(com.mapbox.search.autofill.AddressAutofillSuggestion suggestion, kotlin.coroutines.Continuation<? super com.mapbox.bindgen.Expected<java.lang.Exception,com.mapbox.search.autofill.AddressAutofillResult>>);
9+
method public suspend Object? suggestions(com.mapbox.search.autofill.Query query, com.mapbox.search.autofill.AddressAutofillOptions options, kotlin.coroutines.Continuation<? super com.mapbox.bindgen.Expected<java.lang.Exception,java.util.List<? extends com.mapbox.search.autofill.AddressAutofillSuggestion>>>);
1010
field public static final com.mapbox.search.autofill.AddressAutofill.Companion Companion;
1111
}
1212

1313
public static final class AddressAutofill.Companion {
14-
method public com.mapbox.search.autofill.AddressAutofill create(com.mapbox.common.location.LocationProvider? locationProvider = <anonymous class>());
14+
method public com.mapbox.search.autofill.AddressAutofill create(com.mapbox.common.location.LocationProvider? locationProvider = defaultLocationProvider());
1515
method public com.mapbox.search.autofill.AddressAutofill create();
1616
}
1717

1818
@kotlinx.parcelize.Parcelize public final class AddressAutofillOptions implements android.os.Parcelable {
19-
ctor public AddressAutofillOptions(java.util.List<com.mapbox.search.common.IsoCountryCode>? countries = null, com.mapbox.search.common.IsoLanguageCode? language = <anonymous class>());
19+
ctor public AddressAutofillOptions(java.util.List<com.mapbox.search.common.IsoCountryCode>? countries = null, com.mapbox.search.common.IsoLanguageCode? language = defaultLocaleLanguage());
2020
ctor public AddressAutofillOptions(java.util.List<com.mapbox.search.common.IsoCountryCode>? countries = null);
21+
ctor public AddressAutofillOptions();
2122
method public java.util.List<com.mapbox.search.common.IsoCountryCode>? getCountries();
2223
method public com.mapbox.search.common.IsoLanguageCode? getLanguage();
2324
property public final java.util.List<com.mapbox.search.common.IsoCountryCode>? countries;

‎MapboxSearch/autofill/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ apply from: "../gradle/license.gradle"
1818
apply from: "../gradle/track-public-apis.gradle"
1919

2020
android {
21+
namespace 'com.mapbox.search.autofill'
2122
compileSdkVersion androidVersions.compileSdkVersion
2223

2324
defaultConfig {
@@ -42,6 +43,10 @@ android {
4243
targetCompatibility JavaVersion.VERSION_1_8
4344
}
4445

46+
buildFeatures {
47+
buildConfig = true
48+
}
49+
4550
kotlinOptions {
4651
allWarningsAsErrors = !project.hasProperty('android.injected.invoked.from.ide')
4752
jvmTarget = JavaVersion.VERSION_1_8.toString()

‎MapboxSearch/autofill/src/androidTest/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<manifest
22
xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.mapbox.search.autofill"
43
>
54

65
<application

‎MapboxSearch/autofill/src/main/AndroidManifest.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest package="com.mapbox.search.autofill" />
2+
<manifest />

‎MapboxSearch/base/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ apply from: "../gradle/publish.gradle"
1818
apply from: "../gradle/license.gradle"
1919

2020
android {
21+
namespace 'com.mapbox.search.base'
2122
compileSdkVersion androidVersions.compileSdkVersion
2223

2324
defaultConfig {
@@ -42,6 +43,10 @@ android {
4243
targetCompatibility JavaVersion.VERSION_1_8
4344
}
4445

46+
buildFeatures {
47+
buildConfig = true
48+
}
49+
4550
kotlinOptions {
4651
allWarningsAsErrors = !project.hasProperty('android.injected.invoked.from.ide')
4752
jvmTarget = JavaVersion.VERSION_1_8.toString()

‎MapboxSearch/base/proguard/consumer-proguard-base.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,3 +21,6 @@
2121
# --- AutoValue ---
2222
# AutoValue annotations are retained but dependency is compileOnly.
2323
-dontwarn com.google.auto.value.**
24+
25+
# --- Kotlin ---
26+
-dontwarn kotlin.jvm.internal.SourceDebugExtension

‎MapboxSearch/base/src/main/AndroidManifest.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<manifest
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:tools="http://schemas.android.com/tools"
5-
package="com.mapbox.search.base"
65
>
76

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

‎MapboxSearch/common-tests/build.gradle‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ if (mapboxApiToken == null) {
1111
}
1212

1313
android {
14+
namespace 'com.mapbox.search.common.tests'
1415
compileSdkVersion androidVersions.compileSdkVersion
1516

1617
defaultConfig {
@@ -27,6 +28,10 @@ android {
2728
targetCompatibility JavaVersion.VERSION_1_8
2829
}
2930

31+
buildFeatures {
32+
buildConfig = true
33+
}
34+
3035
kotlinOptions {
3136
allWarningsAsErrors = !project.hasProperty('android.injected.invoked.from.ide')
3237
jvmTarget = JavaVersion.VERSION_1_8.toString()

0 commit comments

Comments
 (0)