From 977edd434ff3ff00a6b1d974044026ee91d21523 Mon Sep 17 00:00:00 2001 From: fqamic Date: Mon, 5 Jun 2023 16:08:48 +0800 Subject: [PATCH] feat: sync android template, update gradle 8.0.2 (#15318) --- templates/xr-huaweivr/build/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build/libservice/AndroidManifest.xml | 2 +- .../xr-huaweivr/build/libservice/build.gradle | 3 +-- .../xr-huaweivr/template/app/proguard-rules.pro | 12 ++++++++++++ .../template/instantapp/proguard-rules.pro | 12 ++++++++++++ templates/xr-meta/build/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xr-meta/build/libservice/AndroidManifest.xml | 2 +- templates/xr-meta/build/libservice/build.gradle | 3 +-- templates/xr-meta/template/app/proguard-rules.pro | 12 ++++++++++++ .../template/instantapp/proguard-rules.pro | 12 ++++++++++++ templates/xr-monado/build/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build/libservice/AndroidManifest.xml | 2 +- templates/xr-monado/build/libservice/build.gradle | 3 +-- .../xr-monado/template/app/proguard-rules.pro | 12 ++++++++++++ .../template/instantapp/proguard-rules.pro | 12 ++++++++++++ templates/xr-pico/build/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xr-pico/build/libservice/AndroidManifest.xml | 2 +- templates/xr-pico/build/libservice/build.gradle | 3 +-- templates/xr-pico/template/app/proguard-rules.pro | 12 ++++++++++++ .../template/instantapp/proguard-rules.pro | 12 ++++++++++++ templates/xr-rokid/build/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../xr-rokid/build/libservice/AndroidManifest.xml | 2 +- templates/xr-rokid/build/libservice/build.gradle | 3 +-- .../xr-rokid/template/app/proguard-rules.pro | 12 ++++++++++++ .../template/instantapp/proguard-rules.pro | 12 ++++++++++++ templates/xr-spaces/build/build.gradle | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 2 +- .../build/libservice/AndroidManifest.xml | 2 +- templates/xr-spaces/build/libservice/build.gradle | 3 +-- .../xr-spaces/template/app/proguard-rules.pro | 12 ++++++++++++ .../template/instantapp/proguard-rules.pro | 15 +++++++++++++++ 36 files changed, 171 insertions(+), 30 deletions(-) diff --git a/templates/xr-huaweivr/build/build.gradle b/templates/xr-huaweivr/build/build.gradle index e8195a4931..930c4fa516 100644 --- a/templates/xr-huaweivr/build/build.gradle +++ b/templates/xr-huaweivr/build/build.gradle @@ -8,7 +8,7 @@ buildscript { // jcenter() // keeped as anchor, will be removed soon } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/xr-huaweivr/build/gradle/wrapper/gradle-wrapper.properties b/templates/xr-huaweivr/build/gradle/wrapper/gradle-wrapper.properties index a5f9e7479a..1734c610eb 100644 --- a/templates/xr-huaweivr/build/gradle/wrapper/gradle-wrapper.properties +++ b/templates/xr-huaweivr/build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 25 14:17:09 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/xr-huaweivr/build/libservice/AndroidManifest.xml b/templates/xr-huaweivr/build/libservice/AndroidManifest.xml index d1b92eeb10..c614a4300b 100644 --- a/templates/xr-huaweivr/build/libservice/AndroidManifest.xml +++ b/templates/xr-huaweivr/build/libservice/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/templates/xr-huaweivr/build/libservice/build.gradle b/templates/xr-huaweivr/build/libservice/build.gradle index 01fdb6ea2f..d8228188f7 100644 --- a/templates/xr-huaweivr/build/libservice/build.gradle +++ b/templates/xr-huaweivr/build/libservice/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.library' android { - namespace 'com.cocos.service' compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() - + namespace 'com.cocos.service' defaultConfig { minSdkVersion PROP_MIN_SDK_VERSION targetSdkVersion PROP_TARGET_SDK_VERSION diff --git a/templates/xr-huaweivr/template/app/proguard-rules.pro b/templates/xr-huaweivr/template/app/proguard-rules.pro index 59c3cbfa69..b0f087ed8f 100644 --- a/templates/xr-huaweivr/template/app/proguard-rules.pro +++ b/templates/xr-huaweivr/template/app/proguard-rules.pro @@ -41,4 +41,16 @@ -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager + -keep class com.huawei.hvr.LibUpdateClient {*;} diff --git a/templates/xr-huaweivr/template/instantapp/proguard-rules.pro b/templates/xr-huaweivr/template/instantapp/proguard-rules.pro index 59c3cbfa69..b0f087ed8f 100644 --- a/templates/xr-huaweivr/template/instantapp/proguard-rules.pro +++ b/templates/xr-huaweivr/template/instantapp/proguard-rules.pro @@ -41,4 +41,16 @@ -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager + -keep class com.huawei.hvr.LibUpdateClient {*;} diff --git a/templates/xr-meta/build/build.gradle b/templates/xr-meta/build/build.gradle index e8195a4931..930c4fa516 100644 --- a/templates/xr-meta/build/build.gradle +++ b/templates/xr-meta/build/build.gradle @@ -8,7 +8,7 @@ buildscript { // jcenter() // keeped as anchor, will be removed soon } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/xr-meta/build/gradle/wrapper/gradle-wrapper.properties b/templates/xr-meta/build/gradle/wrapper/gradle-wrapper.properties index a5f9e7479a..1734c610eb 100644 --- a/templates/xr-meta/build/gradle/wrapper/gradle-wrapper.properties +++ b/templates/xr-meta/build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 25 14:17:09 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/xr-meta/build/libservice/AndroidManifest.xml b/templates/xr-meta/build/libservice/AndroidManifest.xml index f0d3a18b10..2a6fcc88ad 100644 --- a/templates/xr-meta/build/libservice/AndroidManifest.xml +++ b/templates/xr-meta/build/libservice/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/templates/xr-meta/build/libservice/build.gradle b/templates/xr-meta/build/libservice/build.gradle index 01fdb6ea2f..d8228188f7 100644 --- a/templates/xr-meta/build/libservice/build.gradle +++ b/templates/xr-meta/build/libservice/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.library' android { - namespace 'com.cocos.service' compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() - + namespace 'com.cocos.service' defaultConfig { minSdkVersion PROP_MIN_SDK_VERSION targetSdkVersion PROP_TARGET_SDK_VERSION diff --git a/templates/xr-meta/template/app/proguard-rules.pro b/templates/xr-meta/template/app/proguard-rules.pro index dbb43fbbf1..fc884b7676 100644 --- a/templates/xr-meta/template/app/proguard-rules.pro +++ b/templates/xr-meta/template/app/proguard-rules.pro @@ -40,3 +40,15 @@ -dontwarn android.webkit.WebView -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient + +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager \ No newline at end of file diff --git a/templates/xr-meta/template/instantapp/proguard-rules.pro b/templates/xr-meta/template/instantapp/proguard-rules.pro index dbb43fbbf1..fc884b7676 100644 --- a/templates/xr-meta/template/instantapp/proguard-rules.pro +++ b/templates/xr-meta/template/instantapp/proguard-rules.pro @@ -40,3 +40,15 @@ -dontwarn android.webkit.WebView -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient + +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager \ No newline at end of file diff --git a/templates/xr-monado/build/build.gradle b/templates/xr-monado/build/build.gradle index e8195a4931..930c4fa516 100644 --- a/templates/xr-monado/build/build.gradle +++ b/templates/xr-monado/build/build.gradle @@ -8,7 +8,7 @@ buildscript { // jcenter() // keeped as anchor, will be removed soon } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/xr-monado/build/gradle/wrapper/gradle-wrapper.properties b/templates/xr-monado/build/gradle/wrapper/gradle-wrapper.properties index a5f9e7479a..1734c610eb 100644 --- a/templates/xr-monado/build/gradle/wrapper/gradle-wrapper.properties +++ b/templates/xr-monado/build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 25 14:17:09 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/xr-monado/build/libservice/AndroidManifest.xml b/templates/xr-monado/build/libservice/AndroidManifest.xml index 1feb00ddd1..5b15bf24fd 100644 --- a/templates/xr-monado/build/libservice/AndroidManifest.xml +++ b/templates/xr-monado/build/libservice/AndroidManifest.xml @@ -1,4 +1,4 @@ - + + diff --git a/templates/xr-pico/build/libservice/build.gradle b/templates/xr-pico/build/libservice/build.gradle index 01fdb6ea2f..d8228188f7 100644 --- a/templates/xr-pico/build/libservice/build.gradle +++ b/templates/xr-pico/build/libservice/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.library' android { - namespace 'com.cocos.service' compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() - + namespace 'com.cocos.service' defaultConfig { minSdkVersion PROP_MIN_SDK_VERSION targetSdkVersion PROP_TARGET_SDK_VERSION diff --git a/templates/xr-pico/template/app/proguard-rules.pro b/templates/xr-pico/template/app/proguard-rules.pro index dbb43fbbf1..fc884b7676 100644 --- a/templates/xr-pico/template/app/proguard-rules.pro +++ b/templates/xr-pico/template/app/proguard-rules.pro @@ -40,3 +40,15 @@ -dontwarn android.webkit.WebView -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient + +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager \ No newline at end of file diff --git a/templates/xr-pico/template/instantapp/proguard-rules.pro b/templates/xr-pico/template/instantapp/proguard-rules.pro index dbb43fbbf1..fc884b7676 100644 --- a/templates/xr-pico/template/instantapp/proguard-rules.pro +++ b/templates/xr-pico/template/instantapp/proguard-rules.pro @@ -40,3 +40,15 @@ -dontwarn android.webkit.WebView -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient + +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager \ No newline at end of file diff --git a/templates/xr-rokid/build/build.gradle b/templates/xr-rokid/build/build.gradle index e8195a4931..930c4fa516 100644 --- a/templates/xr-rokid/build/build.gradle +++ b/templates/xr-rokid/build/build.gradle @@ -8,7 +8,7 @@ buildscript { // jcenter() // keeped as anchor, will be removed soon } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/xr-rokid/build/gradle/wrapper/gradle-wrapper.properties b/templates/xr-rokid/build/gradle/wrapper/gradle-wrapper.properties index a5f9e7479a..1734c610eb 100644 --- a/templates/xr-rokid/build/gradle/wrapper/gradle-wrapper.properties +++ b/templates/xr-rokid/build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 25 14:17:09 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/xr-rokid/build/libservice/AndroidManifest.xml b/templates/xr-rokid/build/libservice/AndroidManifest.xml index 171b54e82f..ef9a19f895 100644 --- a/templates/xr-rokid/build/libservice/AndroidManifest.xml +++ b/templates/xr-rokid/build/libservice/AndroidManifest.xml @@ -1,4 +1,4 @@ - + diff --git a/templates/xr-rokid/build/libservice/build.gradle b/templates/xr-rokid/build/libservice/build.gradle index 01fdb6ea2f..d8228188f7 100644 --- a/templates/xr-rokid/build/libservice/build.gradle +++ b/templates/xr-rokid/build/libservice/build.gradle @@ -1,9 +1,8 @@ apply plugin: 'com.android.library' android { - namespace 'com.cocos.service' compileSdkVersion PROP_COMPILE_SDK_VERSION.toInteger() - + namespace 'com.cocos.service' defaultConfig { minSdkVersion PROP_MIN_SDK_VERSION targetSdkVersion PROP_TARGET_SDK_VERSION diff --git a/templates/xr-rokid/template/app/proguard-rules.pro b/templates/xr-rokid/template/app/proguard-rules.pro index dbb43fbbf1..fc884b7676 100644 --- a/templates/xr-rokid/template/app/proguard-rules.pro +++ b/templates/xr-rokid/template/app/proguard-rules.pro @@ -40,3 +40,15 @@ -dontwarn android.webkit.WebView -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient + +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager \ No newline at end of file diff --git a/templates/xr-rokid/template/instantapp/proguard-rules.pro b/templates/xr-rokid/template/instantapp/proguard-rules.pro index dbb43fbbf1..fc884b7676 100644 --- a/templates/xr-rokid/template/instantapp/proguard-rules.pro +++ b/templates/xr-rokid/template/instantapp/proguard-rules.pro @@ -40,3 +40,15 @@ -dontwarn android.webkit.WebView -dontwarn android.net.http.SslError -dontwarn android.webkit.WebViewClient + +# This is generated automatically by the Android Gradle plugin. +-dontwarn android.hardware.BatteryState +-dontwarn android.hardware.lights.Light +-dontwarn android.hardware.lights.LightState$Builder +-dontwarn android.hardware.lights.LightState +-dontwarn android.hardware.lights.LightsManager$LightsSession +-dontwarn android.hardware.lights.LightsManager +-dontwarn android.hardware.lights.LightsRequest$Builder +-dontwarn android.hardware.lights.LightsRequest +-dontwarn android.net.ssl.SSLSockets +-dontwarn android.os.VibratorManager \ No newline at end of file diff --git a/templates/xr-spaces/build/build.gradle b/templates/xr-spaces/build/build.gradle index e8195a4931..930c4fa516 100644 --- a/templates/xr-spaces/build/build.gradle +++ b/templates/xr-spaces/build/build.gradle @@ -8,7 +8,7 @@ buildscript { // jcenter() // keeped as anchor, will be removed soon } dependencies { - classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'com.android.tools.build:gradle:8.0.2' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/templates/xr-spaces/build/gradle/wrapper/gradle-wrapper.properties b/templates/xr-spaces/build/gradle/wrapper/gradle-wrapper.properties index a5f9e7479a..1734c610eb 100644 --- a/templates/xr-spaces/build/gradle/wrapper/gradle-wrapper.properties +++ b/templates/xr-spaces/build/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Apr 25 14:17:09 CST 2023 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/templates/xr-spaces/build/libservice/AndroidManifest.xml b/templates/xr-spaces/build/libservice/AndroidManifest.xml index db74c09705..4382e0c9b3 100644 --- a/templates/xr-spaces/build/libservice/AndroidManifest.xml +++ b/templates/xr-spaces/build/libservice/AndroidManifest.xml @@ -1,4 +1,4 @@ - +