diff --git a/play-services-core/build.gradle b/play-services-core/build.gradle index 4d25419ecd..3abf6be1eb 100644 --- a/play-services-core/build.gradle +++ b/play-services-core/build.gradle @@ -51,6 +51,8 @@ dependencies { implementation project(':play-services-vision-core') implementation project(':play-services-wearable-core') + implementation project(':play-services-wallet') + implementation project(':play-services-core-proto') implementation project(':play-services-core:microg-ui-tools') // deprecated diff --git a/play-services-wallet/build.gradle b/play-services-wallet/build.gradle new file mode 100644 index 0000000000..f26f31c7c0 --- /dev/null +++ b/play-services-wallet/build.gradle @@ -0,0 +1,42 @@ +/* + * SPDX-FileCopyrightText: 2026 microG Project Team + * SPDX-License-Identifier: Apache-2.0 + */ + +apply plugin: 'com.android.library' +apply plugin: 'maven-publish' +apply plugin: 'signing' + +android { + namespace "com.google.android.gms.wallet" + + compileSdkVersion androidCompileSdk + buildToolsVersion "$androidBuildVersionTools" + + buildFeatures { + aidl = true + } + + defaultConfig { + versionName version + minSdkVersion androidMinSdk + targetSdkVersion androidTargetSdk + } + + compileOptions { + sourceCompatibility = 1.8 + targetCompatibility = 1.8 + } +} + +apply from: '../gradle/publish-android.gradle' + +description = 'microG implementation of play-services-wallet' + +dependencies { + api project(':play-services-base') + api project(':play-services-basement') + api project(':play-services-tasks') + + annotationProcessor project(':safe-parcel-processor') +} diff --git a/play-services-base/src/main/aidl/com/google/android/gms/wallet/firstparty/WalletCustomTheme.aidl b/play-services-wallet/src/main/aidl/com/google/android/gms/wallet/firstparty/WalletCustomTheme.aidl similarity index 100% rename from play-services-base/src/main/aidl/com/google/android/gms/wallet/firstparty/WalletCustomTheme.aidl rename to play-services-wallet/src/main/aidl/com/google/android/gms/wallet/firstparty/WalletCustomTheme.aidl diff --git a/play-services-base/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.aidl b/play-services-wallet/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.aidl similarity index 100% rename from play-services-base/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.aidl rename to play-services-wallet/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.aidl diff --git a/play-services-base/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.aidl b/play-services-wallet/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.aidl similarity index 100% rename from play-services-base/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.aidl rename to play-services-wallet/src/main/aidl/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.aidl diff --git a/play-services-base/src/main/aidl/com/google/android/gms/wallet/shared/ApplicationParameters.aidl b/play-services-wallet/src/main/aidl/com/google/android/gms/wallet/shared/ApplicationParameters.aidl similarity index 100% rename from play-services-base/src/main/aidl/com/google/android/gms/wallet/shared/ApplicationParameters.aidl rename to play-services-wallet/src/main/aidl/com/google/android/gms/wallet/shared/ApplicationParameters.aidl diff --git a/play-services-base/src/main/aidl/com/google/android/gms/wallet/shared/BuyFlowConfig.aidl b/play-services-wallet/src/main/aidl/com/google/android/gms/wallet/shared/BuyFlowConfig.aidl similarity index 100% rename from play-services-base/src/main/aidl/com/google/android/gms/wallet/shared/BuyFlowConfig.aidl rename to play-services-wallet/src/main/aidl/com/google/android/gms/wallet/shared/BuyFlowConfig.aidl diff --git a/play-services-base/src/main/java/com/google/android/gms/wallet/bender3/Bender3RedirectExtras.java b/play-services-wallet/src/main/java/com/google/android/gms/wallet/bender3/Bender3RedirectExtras.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/gms/wallet/bender3/Bender3RedirectExtras.java rename to play-services-wallet/src/main/java/com/google/android/gms/wallet/bender3/Bender3RedirectExtras.java diff --git a/play-services-base/src/main/java/com/google/android/gms/wallet/firstparty/WalletCustomTheme.java b/play-services-wallet/src/main/java/com/google/android/gms/wallet/firstparty/WalletCustomTheme.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/gms/wallet/firstparty/WalletCustomTheme.java rename to play-services-wallet/src/main/java/com/google/android/gms/wallet/firstparty/WalletCustomTheme.java diff --git a/play-services-base/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.java b/play-services-wallet/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.java rename to play-services-wallet/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsData.java diff --git a/play-services-base/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.java b/play-services-wallet/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.java rename to play-services-wallet/src/main/java/com/google/android/gms/wallet/firstparty/pm/SecurePaymentsPayload.java diff --git a/play-services-base/src/main/java/com/google/android/gms/wallet/shared/ApplicationParameters.java b/play-services-wallet/src/main/java/com/google/android/gms/wallet/shared/ApplicationParameters.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/gms/wallet/shared/ApplicationParameters.java rename to play-services-wallet/src/main/java/com/google/android/gms/wallet/shared/ApplicationParameters.java diff --git a/play-services-base/src/main/java/com/google/android/gms/wallet/shared/BuyFlowConfig.java b/play-services-wallet/src/main/java/com/google/android/gms/wallet/shared/BuyFlowConfig.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/gms/wallet/shared/BuyFlowConfig.java rename to play-services-wallet/src/main/java/com/google/android/gms/wallet/shared/BuyFlowConfig.java diff --git a/play-services-base/src/main/java/com/google/android/wallet/bender3/framework/client/ParcelableKeyValue.java b/play-services-wallet/src/main/java/com/google/android/wallet/bender3/framework/client/ParcelableKeyValue.java similarity index 100% rename from play-services-base/src/main/java/com/google/android/wallet/bender3/framework/client/ParcelableKeyValue.java rename to play-services-wallet/src/main/java/com/google/android/wallet/bender3/framework/client/ParcelableKeyValue.java diff --git a/settings.gradle b/settings.gradle index 331ed33190..6280e88116 100644 --- a/settings.gradle +++ b/settings.gradle @@ -65,6 +65,7 @@ include ':play-services-tasks' include ':play-services-vision' include ':play-services-vision-common' include ':play-services-wearable' +include ':play-services-wallet' include ':play-services-fitness' include ':play-services-api' diff --git a/vending-app/build.gradle b/vending-app/build.gradle index 64aeedeec9..1af7c0c129 100644 --- a/vending-app/build.gradle +++ b/vending-app/build.gradle @@ -90,6 +90,7 @@ dependencies { implementation project(':fake-signature') implementation project(':play-services-auth') implementation project(':play-services-base-core') + implementation project(':play-services-wallet') implementation project(':play-services-core-proto') implementation "com.squareup.wire:wire-runtime:$wireVersion"