mirror of
https://github.com/cocos/cocos4.git
synced 2026-11-20 23:52:40 +08:00
feat: sync android template, update gradle 8.0.2 (#15318)
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cocos.service">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
|
||||
<uses-permission android:name="com.huawei.vrhandle.permission.DEVICE_MANAGER"/>
|
||||
<uses-permission android:name="com.huawei.android.permission.VR"/>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 {*;}
|
||||
|
||||
@@ -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 {*;}
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cocos.service">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Volume Control -->
|
||||
<uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS" />
|
||||
<!-- Tell the system this app requires OpenGL ES 3.1. -->
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cocos.service">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Tell the system this app works in either 3dof or 6dof mode -->
|
||||
<uses-feature
|
||||
android:name="android.hardware.vr.headtracking"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cocos.service">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<application>
|
||||
<meta-data android:name="pvr.app.type" android:value="vr" />
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cocos.service">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<uses-permission android:name="org.khronos.openxr.permission.OPENXR" />
|
||||
<uses-permission android:name="org.khronos.openxr.permission.OPENXR_SYSTEM" />
|
||||
<queries>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.cocos.service">
|
||||
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<!-- Tell the system this app works in either 3dof or 6dof mode -->
|
||||
<uses-feature
|
||||
android:name="android.hardware.vr.headtracking"
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -41,5 +41,17 @@
|
||||
-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 public class com.qualcomm.** { *; }
|
||||
-keep public class hilt_aggregated_deps.** { *; }
|
||||
|
||||
@@ -40,3 +40,18 @@
|
||||
-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
|
||||
|
||||
-keep public class com.qualcomm.** { *; }
|
||||
-keep public class hilt_aggregated_deps.** { *; }
|
||||
|
||||
Reference in New Issue
Block a user