diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index 41ed29bed..c6e33020d 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -18,11 +18,11 @@ jobs: - name: Install Android workload run: dotnet workload install android - - name: Setup OpenJDK 11 + - name: Setup OpenJDK 21 uses: actions/setup-java@v4 with: distribution: 'microsoft' - java-version: '11' + java-version: '21' - name: Restore dotnet tools run: dotnet tool restore @@ -58,6 +58,7 @@ jobs: echo ".NET Version: $(dotnet --version)" echo "Java Version: $(java -version 2>&1 | head -1)" echo "Android SDK Root: $ANDROID_SDK_ROOT" + echo "Android Home: $ANDROID_HOME" echo "Java Home: $JAVA_HOME" echo "=== Installed Workloads ===" dotnet workload list \ No newline at end of file diff --git a/BUILDING.md b/BUILDING.md index 760c06d4e..e3fed28f7 100644 --- a/BUILDING.md +++ b/BUILDING.md @@ -12,10 +12,9 @@ Before building the libraries and samples in this repository, you will need to i dotnet tool install -g cake.tool ``` - * [Microsoft OpenJDK *11*](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-11) - (JDK-17 is not currently supported). + * [Microsoft OpenJDK *21*](https://learn.microsoft.com/en-us/java/openjdk/download#openjdk-21) - The `javac` from your JDK 11 installation must be *first* in `$PATH`/`%PATH%`. + The `javac` from your JDK 21 installation must be *first* in `$PATH`/`%PATH%`. * The [Android SDK](https://developer.android.com/studio), and the `ANDROID_SDK_ROOT` environment variable set to the Android SDK location. diff --git a/build/cake/build-and-package.cake b/build/cake/build-and-package.cake index 0e372ab6a..f9353e269 100644 --- a/build/cake/build-and-package.cake +++ b/build/cake/build-and-package.cake @@ -92,6 +92,8 @@ void BuildGradleProject (string root, string outputDir, bool moveFile) void RunGradle (DirectoryPath root, string target) { root = MakeAbsolute (root); + + Information($"Running Gradle {target} in {root}"); var proc = IsRunningOnWindows () ? root.CombineWithFilePath ("gradlew.bat").FullPath @@ -102,6 +104,8 @@ void RunGradle (DirectoryPath root, string target) args += $" {target} -p {root}"; + Information($"Running {proc} {args}"); + var exitCode = StartProcess (proc, args); if (exitCode != 0) diff --git a/build/ci/build-and-test.yml b/build/ci/build-and-test.yml index cf6512479..731097489 100644 --- a/build/ci/build-and-test.yml +++ b/build/ci/build-and-test.yml @@ -8,6 +8,7 @@ parameters: steps: - pwsh: | + Get-Content $PSCommandPath dotnet cake build.cake ` --target=ci-build ` --configuration="$(configuration)" ` @@ -21,12 +22,14 @@ steps: RepositoryType: "git" - pwsh: | + Get-Content $PSCommandPath dotnet cake validation.cake ` --namespaces="${{ join(',', parameters.validPackagePrefixes) }}" ` --verbosity="$(verbosity)" displayName: 'Run NuGet package validation' - pwsh: | + Get-Content $PSCommandPath dotnet cake nuget-diff.cake ` --artifacts="${{ parameters.artifactsPath }}" ` --output="${{ parameters.artifactsPath }}/api-diff" ` @@ -35,10 +38,13 @@ steps: displayName: 'Generate API diff' condition: eq(variables['Agent.OS'], 'Windows_NT') - - pwsh: dotnet cake utilities.cake -t=verify-namespace-file + - pwsh: | + Get-Content $PSCommandPath + dotnet cake utilities.cake -t=verify-namespace-file displayName: Verify published namespaces - pwsh: | + Get-Content $PSCommandPath dotnet cake build.cake ` --target=ci-samples ` --configuration="$(configuration)" ` diff --git a/build/ci/build.yml b/build/ci/build.yml index dcbdbd1d5..2fd523c97 100644 --- a/build/ci/build.yml +++ b/build/ci/build.yml @@ -51,6 +51,7 @@ jobs: # Copy SignList.xml to output - pwsh: | + Get-Content $PSCommandPath $srcExists = (Test-Path "${{ parameters.signListPath }}") $dstExists = (Test-Path "${{ parameters.artifactsPath }}\SignList.xml") if ($srcExists -and !$dstExists) { diff --git a/build/ci/job-extended-tests.yml b/build/ci/job-extended-tests.yml index 3741f170b..bc4a2f9db 100644 --- a/build/ci/job-extended-tests.yml +++ b/build/ci/job-extended-tests.yml @@ -36,14 +36,14 @@ jobs: arguments: -c $(configuration) # Figure out which tests this slice is running - - pwsh: >- - dotnet dotnet-test-slicer - slice - --test-assembly="${{ parameters.testAssembly }}" - --test-filter="${{ parameters.testFilter }}" - --slice-number=$(System.JobPositionInPhase) - --total-slices=$(System.TotalJobsInPhase) - --outfile="${{ parameters.testAssembly }}.runsettings" + - pwsh: | + Get-Content $PSCommandPath + dotnet dotnet-test-slicer slice ` + --test-assembly="${{ parameters.testAssembly }}" ` + --test-filter="${{ parameters.testFilter }}" ` + --slice-number=$(System.JobPositionInPhase) ` + --total-slices=$(System.TotalJobsInPhase) ` + --outfile="${{ parameters.testAssembly }}.runsettings" displayName: Slice unit tests failOnStderr: true diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index 558486410..2f7dafdfa 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -1,7 +1,7 @@ parameters: installAndroidDependencies: false androidSdkRoot: $(Agent.TempDirectory)/android-sdk - javaSdkRoot: $(Agent.ToolsDirectory)\jdk11 + javaSdkRoot: $(Agent.ToolsDirectory)\jdk21 steps: # before the build starts, make sure the tooling is as expected. Clear the cache on shared agents @@ -46,18 +46,18 @@ steps: - bash: | if [[ "$(Agent.Name)" == *"Azure Pipelines"* ]]; then - echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_11_X64)" + echo "##vso[task.setvariable variable=JAVA_HOME]$(JAVA_HOME_21_X64)" else - echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-11.jdk/Contents/Home" + echo "##vso[task.setvariable variable=JAVA_HOME]/Library/Java/JavaVirtualMachines/microsoft-21.jdk/Contents/Home" fi - displayName: Use Java 11 SDK (Mac) + displayName: Use Java 21 SDK (Mac) condition: eq( variables['Agent.OS'], 'Darwin' ) - task: JavaToolInstaller@0 - displayName: Use Java 11 SDK (Windows) + displayName: Use Java 21 SDK (Windows) condition: and(eq( variables['Agent.OS'], 'Windows_NT' ), ne(${{ parameters.installAndroidDependencies }}, true)) inputs: - versionSpec: '11' + versionSpec: '21' jdkArchitectureOption: 'x64' jdkSourceOption: 'PreInstalled' @@ -86,26 +86,27 @@ steps: - pwsh: | Write-Host "##vso[task.setvariable variable=AndroidSdkDirectory]${{ parameters.androidSdkRoot }}" Write-Host "##vso[task.setvariable variable=ANDROID_SDK_ROOT]${{ parameters.androidSdkRoot }}" - displayName: Set ANDROID_SDK_ROOT to ${{ parameters.androidSdkRoot }} + Write-Host "##vso[task.setvariable variable=ANDROID_HOME]${{ parameters.androidSdkRoot }}" + displayName: Set ANDROID_SDK_ROOT and ANDROID_HOME to ${{ parameters.androidSdkRoot }} - ${{ if eq(parameters.installAndroidDependencies, true) }}: - pwsh: | - $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-windows-x64.zip" + $url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.8-windows-x64.zip" if ($IsMacOS) { - $url = "https://aka.ms/download-jdk/microsoft-jdk-11.0.26-macos-x64.tar.gz" + $url = "https://aka.ms/download-jdk/microsoft-jdk-21.0.8-macos-x64.tar.gz" } $fileName = [System.IO.Path]::GetFileName($url) Invoke-WebRequest -Uri $url -OutFile $fileName - Write-Host "##vso[task.setvariable variable=JDK_11_FILE_PATH]$(Build.StagingDirectory)/$fileName" - displayName: Download Java 11 SDK + Write-Host "##vso[task.setvariable variable=JDK_21_FILE_PATH]$(Build.StagingDirectory)/$fileName" + displayName: Download Java 21 SDK workingDirectory: $(Build.StagingDirectory) - task: JavaToolInstaller@0 - displayName: Use Java 11 SDK + displayName: Use Java 21 SDK inputs: - versionSpec: '11' + versionSpec: '21' jdkArchitectureOption: 'x64' jdkSourceOption: LocalDirectory - jdkFile: $(JDK_11_FILE_PATH) + jdkFile: $(JDK_21_FILE_PATH) jdkDestinationDirectory: ${{ parameters.javaSdkRoot }} cleanDestinationDirectory: true diff --git a/published-namespaces.txt b/published-namespaces.txt index d7b1ba5f5..9471059ad 100644 --- a/published-namespaces.txt +++ b/published-namespaces.txt @@ -1367,8 +1367,6 @@ Xamarin.Google.Android.DataTransport.Runtime.Time Xamarin.Google.Android.DataTransport.Runtime.Util Xamarin.Google.Android.Finsky.ExternalReferrer Xamarin.Google.Android.Odml.Image -Xamarin.Google.Android.Play.Asset.Delivery -Xamarin.Google.Android.Play.Core Xamarin.Google.Android.Play.Core.AppUpdate Xamarin.Google.Android.Play.Core.AppUpdate.Install Xamarin.Google.Android.Play.Core.AppUpdate.Install.Model @@ -1391,7 +1389,6 @@ Xamarin.Google.Android.Play.Core.SplitInstall Xamarin.Google.Android.Play.Core.SplitInstall.Model Xamarin.Google.Android.Play.Core.SplitInstall.Testing Xamarin.Google.Android.Play.Core.Tasks -Xamarin.Google.Android.Play.Feature.Delivery Xamarin.Google.Android.Recaptcha Xamarin.Google.Crypto.Tink Xamarin.Google.Crypto.Tink.Aead diff --git a/source/com.google.android.material/material.extensions/app/build.gradle b/source/com.google.android.material/material.extensions/app/build.gradle index 483dde819..128163478 100644 --- a/source/com.google.android.material/material.extensions/app/build.gradle +++ b/source/com.google.android.material/material.extensions/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + namespace 'com.xamarin.google.android.material.extensions.app' + compileSdk 34 defaultConfig { applicationId "com.xamarin.google.android.material.extensions.app" - minSdkVersion 16 - targetSdkVersion 29 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" @@ -20,7 +20,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml b/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml index 156a5ed82..bdb1e58ce 100644 --- a/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml +++ b/source/com.google.android.material/material.extensions/app/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + diff --git a/source/com.google.android.material/material.extensions/build.gradle b/source/com.google.android.material/material.extensions/build.gradle index 659b03c26..2eaa5fe38 100644 --- a/source/com.google.android.material/material.extensions/build.gradle +++ b/source/com.google.android.material/material.extensions/build.gradle @@ -4,11 +4,11 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.6.2' + classpath 'com.android.tools.build:gradle:8.12.0' // NOTE: Do not place your application dependencies here; they belong @@ -19,7 +19,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/source/com.google.android.material/material.extensions/extensions-aar/build.gradle b/source/com.google.android.material/material.extensions/extensions-aar/build.gradle index f964d0f5e..f89253952 100644 --- a/source/com.google.android.material/material.extensions/extensions-aar/build.gradle +++ b/source/com.google.android.material/material.extensions/extensions-aar/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion "29.0.3" + namespace 'com.xamarin.google.android.material.extensions' + compileSdk 34 defaultConfig { - minSdkVersion 16 - targetSdkVersion 29 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" @@ -20,7 +20,11 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } } dependencies { diff --git a/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml b/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml index c27327a03..972c3a837 100644 --- a/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml +++ b/source/com.google.android.material/material.extensions/extensions-aar/src/main/AndroidManifest.xml @@ -1,2 +1,3 @@ - + + + \ No newline at end of file diff --git a/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties b/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties index a4b442974..3ae1e2f12 100644 --- a/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties +++ b/source/com.google.android.material/material.extensions/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/source/com.google.android.play/asset-delivery/PublicAPI/PublicAPI.Unshipped.txt b/source/com.google.android.play/asset-delivery/PublicAPI/PublicAPI.Unshipped.txt index 4afdfb579..073fe86b5 100644 --- a/source/com.google.android.play/asset-delivery/PublicAPI/PublicAPI.Unshipped.txt +++ b/source/com.google.android.play/asset-delivery/PublicAPI/PublicAPI.Unshipped.txt @@ -1,6 +1,4 @@ #nullable enable -Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig -Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.BuildConfig() -> void Xamarin.Google.Android.Play.Core.AssetPacks.AssetLocation Xamarin.Google.Android.Play.Core.AssetPacks.AssetLocation.AssetLocation() -> void Xamarin.Google.Android.Play.Core.AssetPacks.AssetLocation.AssetLocation(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void @@ -92,13 +90,6 @@ abstract Xamarin.Google.Android.Play.Core.AssetPacks.AssetPackState.TransferProg abstract Xamarin.Google.Android.Play.Core.AssetPacks.AssetPackState.UpdateAvailability() -> int abstract Xamarin.Google.Android.Play.Core.AssetPacks.AssetPackStates.PackStates() -> System.Collections.Generic.IDictionary? abstract Xamarin.Google.Android.Play.Core.AssetPacks.AssetPackStates.TotalBytes() -> long -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.ApplicationId = "xamarin.google.android.play.asset.delivery" -> string! -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.BuildType = "release" -> string! -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.Debug = false -> bool -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.Flavor = "" -> string! -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.LibraryPackageName = "xamarin.google.android.play.asset.delivery" -> string! -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.VersionCode = 1 -> int -const Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.VersionName = "1.0" -> string! const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackErrorCode.AccessDenied = -7 -> int const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackErrorCode.ApiNotAvailable = -5 -> int const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackErrorCode.AppNotOwned = -13 -> int @@ -127,7 +118,6 @@ const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackStorageMethod.S const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackUpdateAvailability.Unknown = 0 -> int const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackUpdateAvailability.UpdateAvailable = 2 -> int const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackUpdateAvailability.UpdateNotAvailable = 1 -> int -override Xamarin.Google.Android.Play.Asset.Delivery.BuildConfig.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.AssetPacks.AssetLocation.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.AssetPacks.AssetLocation.ThresholdClass.get -> nint override Xamarin.Google.Android.Play.Core.AssetPacks.AssetLocation.ThresholdType.get -> System.Type! diff --git a/source/com.google.android.play/asset.delivery.extensions/build.gradle b/source/com.google.android.play/asset.delivery.extensions/build.gradle index 3f802e378..7a4faeda4 100644 --- a/source/com.google.android.play/asset.delivery.extensions/build.gradle +++ b/source/com.google.android.play/asset.delivery.extensions/build.gradle @@ -2,10 +2,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:3.6.2" + classpath "com.android.tools.build:gradle:8.12.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/source/com.google.android.play/asset.delivery.extensions/extensions-aar/build.gradle b/source/com.google.android.play/asset.delivery.extensions/extensions-aar/build.gradle index 2b280fdb3..17134c3c3 100644 --- a/source/com.google.android.play/asset.delivery.extensions/extensions-aar/build.gradle +++ b/source/com.google.android.play/asset.delivery.extensions/extensions-aar/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion "30.0.2" + namespace 'xamarin.google.android.play.asset.delivery' + compileSdk 34 defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" @@ -20,6 +20,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/source/com.google.android.play/asset.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml b/source/com.google.android.play/asset.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml index 55c74d424..972c3a837 100644 --- a/source/com.google.android.play/asset.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml +++ b/source/com.google.android.play/asset.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml @@ -1,5 +1,3 @@ - + - / \ No newline at end of file diff --git a/source/com.google.android.play/asset.delivery.extensions/gradle/wrapper/gradle-wrapper.properties b/source/com.google.android.play/asset.delivery.extensions/gradle/wrapper/gradle-wrapper.properties index a4b442974..3ae1e2f12 100644 --- a/source/com.google.android.play/asset.delivery.extensions/gradle/wrapper/gradle-wrapper.properties +++ b/source/com.google.android.play/asset.delivery.extensions/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/source/com.google.android.play/core.extensions/build.gradle b/source/com.google.android.play/core.extensions/build.gradle index 3f802e378..7a4faeda4 100644 --- a/source/com.google.android.play/core.extensions/build.gradle +++ b/source/com.google.android.play/core.extensions/build.gradle @@ -2,10 +2,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:3.6.2" + classpath "com.android.tools.build:gradle:8.12.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/source/com.google.android.play/core.extensions/extensions-aar/build.gradle b/source/com.google.android.play/core.extensions/extensions-aar/build.gradle index 0e76ab673..3be791a6f 100644 --- a/source/com.google.android.play/core.extensions/extensions-aar/build.gradle +++ b/source/com.google.android.play/core.extensions/extensions-aar/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion "30.0.2" + namespace 'xamarin.google.android.play.core' + compileSdk 34 defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" @@ -20,10 +20,15 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + + lint { + baseline = file("lint-baseline.xml") + } } dependencies { diff --git a/source/com.google.android.play/core.extensions/extensions-aar/lint-baseline.xml b/source/com.google.android.play/core.extensions/extensions-aar/lint-baseline.xml new file mode 100644 index 000000000..33227cd29 --- /dev/null +++ b/source/com.google.android.play/core.extensions/extensions-aar/lint-baseline.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + diff --git a/source/com.google.android.play/core.extensions/extensions-aar/src/main/AndroidManifest.xml b/source/com.google.android.play/core.extensions/extensions-aar/src/main/AndroidManifest.xml index ed53fece9..972c3a837 100644 --- a/source/com.google.android.play/core.extensions/extensions-aar/src/main/AndroidManifest.xml +++ b/source/com.google.android.play/core.extensions/extensions-aar/src/main/AndroidManifest.xml @@ -1,5 +1,3 @@ - + - / \ No newline at end of file diff --git a/source/com.google.android.play/core.extensions/gradle/wrapper/gradle-wrapper.properties b/source/com.google.android.play/core.extensions/gradle/wrapper/gradle-wrapper.properties index a4b442974..3ae1e2f12 100644 --- a/source/com.google.android.play/core.extensions/gradle/wrapper/gradle-wrapper.properties +++ b/source/com.google.android.play/core.extensions/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/source/com.google.android.play/core/PublicAPI/PublicAPI.Unshipped.txt b/source/com.google.android.play/core/PublicAPI/PublicAPI.Unshipped.txt index 5e238705f..b2bfdd01d 100644 --- a/source/com.google.android.play/core/PublicAPI/PublicAPI.Unshipped.txt +++ b/source/com.google.android.play/core/PublicAPI/PublicAPI.Unshipped.txt @@ -84,8 +84,6 @@ Xamarin.Google.Android.Play.Core.AssetPacks.Model.IAssetPackStorageMethod Xamarin.Google.Android.Play.Core.AssetPacks.NativeAssetPackStateUpdateListener Xamarin.Google.Android.Play.Core.AssetPacks.NativeAssetPackStateUpdateListener.NativeAssetPackStateUpdateListener() -> void Xamarin.Google.Android.Play.Core.AssetPacks.NativeAssetPackStateUpdateListener.NativeAssetPackStateUpdateListener(nint javaReference, Android.Runtime.JniHandleOwnership transfer) -> void -Xamarin.Google.Android.Play.Core.BuildConfig -Xamarin.Google.Android.Play.Core.BuildConfig.BuildConfig() -> void Xamarin.Google.Android.Play.Core.Common.IIntentSenderForResultStarter Xamarin.Google.Android.Play.Core.Common.IIntentSenderForResultStarter.StartIntentSenderForResult(Android.Content.IntentSender! p0, int p1, Android.Content.Intent? p2, int p3, int p4, int p5, Android.OS.Bundle? p6) -> void Xamarin.Google.Android.Play.Core.Common.LocalTestingException @@ -318,13 +316,6 @@ const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackStatus.Unknown const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackStatus.WaitingForWifi = 7 -> int const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackStorageMethod.ApkAssets = 1 -> int const Xamarin.Google.Android.Play.Core.AssetPacks.Model.AssetPackStorageMethod.StorageFiles = 0 -> int -const Xamarin.Google.Android.Play.Core.BuildConfig.ApplicationId = "xamarin.google.android.play.core" -> string! -const Xamarin.Google.Android.Play.Core.BuildConfig.BuildType = "release" -> string! -const Xamarin.Google.Android.Play.Core.BuildConfig.Debug = false -> bool -const Xamarin.Google.Android.Play.Core.BuildConfig.Flavor = "" -> string! -const Xamarin.Google.Android.Play.Core.BuildConfig.LibraryPackageName = "xamarin.google.android.play.core" -> string! -const Xamarin.Google.Android.Play.Core.BuildConfig.VersionCode = 1 -> int -const Xamarin.Google.Android.Play.Core.BuildConfig.VersionName = "1.0" -> string! const Xamarin.Google.Android.Play.Core.Install.Model.ActivityResult.ResultInAppUpdateFailed = 1 -> int const Xamarin.Google.Android.Play.Core.Install.Model.AppUpdateType.Flexible = 0 -> int const Xamarin.Google.Android.Play.Core.Install.Model.AppUpdateType.Immediate = 1 -> int @@ -420,7 +411,6 @@ override Xamarin.Google.Android.Play.Core.AssetPacks.ExtractionForegroundService override Xamarin.Google.Android.Play.Core.AssetPacks.NativeAssetPackStateUpdateListener.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.AssetPacks.NativeAssetPackStateUpdateListener.ThresholdClass.get -> nint override Xamarin.Google.Android.Play.Core.AssetPacks.NativeAssetPackStateUpdateListener.ThresholdType.get -> System.Type! -override Xamarin.Google.Android.Play.Core.BuildConfig.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.Common.LocalTestingException.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.Common.PlayCoreDialogWrapperActivity.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.Common.PlayCoreDialogWrapperActivity.ThresholdClass.get -> nint diff --git a/source/com.google.android.play/feature-delivery/PublicAPI/PublicAPI.Unshipped.txt b/source/com.google.android.play/feature-delivery/PublicAPI/PublicAPI.Unshipped.txt index b1831f8de..8ff717332 100644 --- a/source/com.google.android.play/feature-delivery/PublicAPI/PublicAPI.Unshipped.txt +++ b/source/com.google.android.play/feature-delivery/PublicAPI/PublicAPI.Unshipped.txt @@ -77,8 +77,6 @@ Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManager.Un Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManager.Zza(Xamarin.Google.Android.Play.Core.SplitInstall.ISplitInstallStateUpdatedListener? p0) -> void Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManager.Zzb(Xamarin.Google.Android.Play.Core.SplitInstall.ISplitInstallStateUpdatedListener? p0) -> void Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManagerFactory -Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig -Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.BuildConfig() -> void abstract Xamarin.Google.Android.Play.Core.SplitInstall.SplitInstallSessionState.BytesDownloaded() -> long abstract Xamarin.Google.Android.Play.Core.SplitInstall.SplitInstallSessionState.ErrorCode() -> int abstract Xamarin.Google.Android.Play.Core.SplitInstall.SplitInstallSessionState.ResolutionIntent() -> Android.App.PendingIntent? @@ -112,13 +110,6 @@ const Xamarin.Google.Android.Play.Core.SplitInstall.Model.SplitInstallSessionSta const Xamarin.Google.Android.Play.Core.SplitInstall.Model.SplitInstallSessionStatus.Pending = 1 -> int const Xamarin.Google.Android.Play.Core.SplitInstall.Model.SplitInstallSessionStatus.RequiresUserConfirmation = 8 -> int const Xamarin.Google.Android.Play.Core.SplitInstall.Model.SplitInstallSessionStatus.Unknown = 0 -> int -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.ApplicationId = "xamarin.google.android.play.feature.delivery" -> string! -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.BuildType = "release" -> string! -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.Debug = false -> bool -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.Flavor = "" -> string! -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.LibraryPackageName = "xamarin.google.android.play.feature.delivery" -> string! -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.VersionCode = 1 -> int -const Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.VersionName = "1.0" -> string! override Xamarin.Google.Android.Play.Core.SplitCompat.SplitCompat.JniPeerMembers.get -> Java.Interop.JniPeerMembers! override Xamarin.Google.Android.Play.Core.SplitCompat.SplitCompat.ThresholdClass.get -> nint override Xamarin.Google.Android.Play.Core.SplitCompat.SplitCompat.ThresholdType.get -> System.Type! @@ -149,7 +140,6 @@ override Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallM override Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManager.ThresholdClass.get -> nint override Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManager.ThresholdType.get -> System.Type! override Xamarin.Google.Android.Play.Core.SplitInstall.Testing.FakeSplitInstallManagerFactory.JniPeerMembers.get -> Java.Interop.JniPeerMembers! -override Xamarin.Google.Android.Play.Feature.Delivery.BuildConfig.JniPeerMembers.get -> Java.Interop.JniPeerMembers! static Xamarin.Google.Android.Play.Core.SplitCompat.SplitCompat.Install(Android.Content.Context! context) -> bool static Xamarin.Google.Android.Play.Core.SplitCompat.SplitCompat.InstallActivity(Android.Content.Context! context) -> bool static Xamarin.Google.Android.Play.Core.SplitCompat.SplitCompat.Zza.get -> int diff --git a/source/com.google.android.play/feature.delivery.extensions/build.gradle b/source/com.google.android.play/feature.delivery.extensions/build.gradle index 3f802e378..7a4faeda4 100644 --- a/source/com.google.android.play/feature.delivery.extensions/build.gradle +++ b/source/com.google.android.play/feature.delivery.extensions/build.gradle @@ -2,10 +2,10 @@ buildscript { repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:3.6.2" + classpath "com.android.tools.build:gradle:8.12.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files @@ -15,7 +15,7 @@ buildscript { allprojects { repositories { google() - jcenter() + mavenCentral() } } diff --git a/source/com.google.android.play/feature.delivery.extensions/extensions-aar/build.gradle b/source/com.google.android.play/feature.delivery.extensions/extensions-aar/build.gradle index ac5748c66..76452f3ba 100644 --- a/source/com.google.android.play/feature.delivery.extensions/extensions-aar/build.gradle +++ b/source/com.google.android.play/feature.delivery.extensions/extensions-aar/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 29 - buildToolsVersion "30.0.2" + namespace 'xamarin.google.android.play.feature.delivery' + compileSdk 34 defaultConfig { - minSdkVersion 21 - targetSdkVersion 29 + minSdk 21 + targetSdk 34 versionCode 1 versionName "1.0" @@ -20,6 +20,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + compileOptions { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 diff --git a/source/com.google.android.play/feature.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml b/source/com.google.android.play/feature.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml index cc0e0d592..972c3a837 100644 --- a/source/com.google.android.play/feature.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml +++ b/source/com.google.android.play/feature.delivery.extensions/extensions-aar/src/main/AndroidManifest.xml @@ -1,5 +1,3 @@ - + - / \ No newline at end of file diff --git a/source/com.google.android.play/feature.delivery.extensions/gradle/wrapper/gradle-wrapper.properties b/source/com.google.android.play/feature.delivery.extensions/gradle/wrapper/gradle-wrapper.properties index a4b442974..3ae1e2f12 100644 --- a/source/com.google.android.play/feature.delivery.extensions/gradle/wrapper/gradle-wrapper.properties +++ b/source/com.google.android.play/feature.delivery.extensions/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists