update:更新继承aar 和集成

2026-01-27 20:04:02 +08:00
parent fa1aa0662a
commit 13b931eb8e
8 changed files with 37 additions and 3 deletions
--- a/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties
+++ b/sdk-intergration/Assets/Plugins/Android/gradleTemplate.properties
@@ -1,10 +1,11 @@
 org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
 org.gradle.parallel=true
 unityStreamingAssets=**STREAMING_ASSETS**
-android.useAndroidX=true
-android.enableJetifier=true
 # Android Resolver Properties Start
 android.useAndroidX=true
 android.enableJetifier=true
 # Android Resolver Properties End
+
+android.suppressUnsupportedCompileSdk=35
+
 **ADDITIONAL_PROPERTIES**
--- a/sdk-intergration/Assets/Plugins/Android/launcherTemplate.gradle
+++ b/sdk-intergration/Assets/Plugins/Android/launcherTemplate.gradle
@@ -17,6 +17,7 @@ android {
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
+        
    }

    defaultConfig {
@@ -28,6 +29,14 @@ android {
        }
        versionCode **VERSIONCODE**
        versionName '**VERSIONNAME**'
+
+        // ↓↓↓  这里放你的 VK ID 占位符  ↓↓↓
+        manifestPlaceholders = [
+            VKIDRedirectHost  : "vk.ru",
+            VKIDRedirectScheme: "vk54428192",
+            VKIDClientID      : "54428192",
+            VKIDClientSecret  : "xxxxx"
+        ]
    }

    aaptOptions {
--- a/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle
+++ b/sdk-intergration/Assets/Plugins/Android/mainTemplate.gradle
@@ -59,6 +59,10 @@ dependencies {
    implementation "androidx.credentials:credentials-play-services-auth:1.3.0"
    implementation "com.google.android.libraries.identity.googleid:googleid:1.1.1"

+
+    implementation "com.vk.id:vkid:2.5.1"
+    coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:2.1.2"
+
 // Android Resolver Dependencies Start
    implementation 'com.android.installreferrer:installreferrer:2.1' // Assets/AppsFlyer/Editor/AppsFlyerDependencies.xml:10
    implementation 'com.applovin.mediation:facebook-adapter:[6.18.0.1]' // Assets/MaxSdk/Mediation/Facebook/Editor/Dependencies.xml:8
@@ -96,6 +100,7 @@ android {
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_11
        targetCompatibility JavaVersion.VERSION_11
+        coreLibraryDesugaringEnabled true
    }

    defaultConfig {
@@ -104,6 +109,7 @@ android {
        ndk {
            abiFilters **ABIFILTERS**
        }
+        
        versionCode **VERSIONCODE**
        versionName '**VERSIONNAME**'
        consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
--- a/sdk-intergration/Assets/Plugins/Android/settingsTemplate.gradle
+++ b/sdk-intergration/Assets/Plugins/Android/settingsTemplate.gradle
@@ -16,6 +16,17 @@ dependencyResolutionManagement {
        **ARTIFACTORYREPOSITORY**
        google()
        mavenCentral()
+        
+        maven{
+            url "https://artifactory-external.vkpartner.ru/artifactory/vkid-sdk-android/"
+        }
+        maven{
+            url "https://artifactory-external.vkpartner.ru/artifactory/maven/"
+        }
+        maven{
+            url "https://artifactory-external.vkpartner.ru/artifactory/vk-id-captcha/android/"
+        }
+        
 // Android Resolver Repos Start
        def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
        maven {
--- a/sdk-intergration/Assets/Settings/URP-HighFidelity-Renderer.asset
+++ b/sdk-intergration/Assets/Settings/URP-HighFidelity-Renderer.asset
@@ -76,6 +76,12 @@ MonoBehaviour:
      type: 3}
    dataDrivenLensFlare: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92,
      type: 3}
+    terrainDetailLitPS: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144,
+      type: 3}
+    terrainDetailGrassPS: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1,
+      type: 3}
+    terrainDetailGrassBillboardPS: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90,
+      type: 3}
  m_AssetVersion: 2
  m_OpaqueLayerMask:
    serializedVersion: 2
--- a/sdk-intergration/Packages/tysdk/Plugins/Android/tuyoosdk_1.0.0.aar
+++ b/sdk-intergration/Packages/tysdk/Plugins/Android/tuyoosdk_1.0.0.aar
--- a/sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs
+++ b/sdk-intergration/Packages/tysdk/Runtime/TYSdkModel.cs
@@ -9,6 +9,7 @@ namespace tysdk
        hwGoogle,
        hwFacebook,
        hwGuest,
+        hwRustore,
        Apple,
        none
    }
--- a/sdk-intergration/ProjectSettings/ProjectSettings.asset
+++ b/sdk-intergration/ProjectSettings/ProjectSettings.asset
@@ -173,7 +173,7 @@ PlayerSettings:
    tvOS: 0
  overrideDefaultApplicationIdentifier: 1
  AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 25
+  AndroidMinSdkVersion: 26
  AndroidTargetSdkVersion: 35
  AndroidPreferredInstallLocation: 1
  aotOptions: