From a458ea510569c1c8ef0ca67b8af21ccf9447c9a3 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期日, 19 十一月 2023 20:45:35 +0800
Subject: [PATCH] 0312 编译版本为30 要留意兼容性问题

---
 SdkProject/library/build.gradle |   69 +++++++++++++++++++++++++---------
 1 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 09ab1a6..f562d57 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -1,6 +1,8 @@
 plugins {
     id 'com.android.library'
+    id 'com.google.gms.google-services'
 }
+
 def rootPath = rootProject.getRootDir().getAbsolutePath()
 def channelPath = "${rootPath}/channel/${CHANNEL_NAME}"
 
@@ -32,18 +34,20 @@
 def channelJavaFiles = getAllFiles(new ArrayList<File>(), "${channelPath}/java")
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "28.0.1"
+    compileSdkVersion 30
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 31
         versionCode 1
         versionName "1.0"
 
 //        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
+        multiDexEnabled true
     }
+
 
     flavorDimensions "version"
     productFlavors {
@@ -62,6 +66,7 @@
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    packagingOptions {exclude 'META-INF/rxjava.properties'}
     lintOptions {
         checkReleaseBuilds false
         abortOnError false
@@ -98,11 +103,7 @@
                 java.srcDirs "${pluginPath}/java"
                 jniLibs.srcDirs "${pluginPath}libs"
                 res.srcDirs "${pluginPath}/res"
-                manifest {
-                    File file = file("${pluginPath}/AndroidManifest.xml")
-                    if (file.exists())
-                        srcFile "${pluginPath}/AndroidManifest.xml"
-                }
+                //娓呭崟鍙兘鍚堝苟涓�涓紝鎵�鏈夋彃浠剁殑娓呭崟闇�瑕佹墜鍔ㄥ鍒跺埌瀵瑰簲鐨勬笭閬撻噷
             }
         }
     }
@@ -142,12 +143,13 @@
 }
 
 task deleteSdk() {
-    delete "${outPutPath}\\${CHANNEL_NAME}"
+    delete "${outPutPath}\\${CHANNEL_NAME}\\debug"
+    delete "${outPutPath}\\${CHANNEL_NAME}\\release"
 }
 
 //鎵ц鎵撳寘浠诲姟浠ュ強鎷疯礉鍒板閮�
 task assembleAndCopySdk() {
-    dependsOn 'assembleMerger'
+    dependsOn 'assemble'
     dependsOn deleteSdk
     dependsOn copyDebugSdk
     dependsOn copyReleaseSdk
@@ -165,29 +167,60 @@
     }
     plugins.each {
         deps = file("${rootPath}/plugins/${it}/deps.gradle")
-        deps.eachLine { line ->
-            if (line != null)
-                content += line + "\n"
+        if(deps.exists()){
+            deps.eachLine { line ->
+                if (line != null)
+                    content += line + "\n"
+            }
         }
     }
     def dir = new File("${outPutPath}\\${CHANNEL_NAME}")
     def libraries = new File("${outPutPath}\\${CHANNEL_NAME}\\deps.gradle")
     dir.mkdir()
+    if (libraries.exists())
+        libraries.delete()
     if (!libraries.exists())
         libraries.createNewFile()
     libraries.text = content
 }
 
 dependencies {
-    implementation 'com.android.support:support-annotations:28.0.0'
-    testImplementation 'junit:junit:4.13.1'
-
+    implementation 'androidx.annotation:annotation:1.0.0'
+    testImplementation 'junit:junit:4.13.2'
     //noinspection GradleCompatible
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+//    implementation 'com.android.support:appcompat-v7:28.0.0'
 
 //    implementation 'com.github.pqpo:Log4a:1.4.2@aar'
 
     implementation fileTree(dir: "../channel/${CHANNEL_NAME}/libs/", include: ['*.jar'])
+    plugins.each {
+        implementation fileTree(dir: "${rootPath}/plugins/${it}/libs/", include: ['*.jar'])
+    }
     implementation fileTree(dir: 'libs', include: ['*.jar'], exclude: ['unity-classes.jar'])
     compileOnly files('libs/unity-classes.jar')
-}
\ No newline at end of file
+
+    implementation('androidx.appcompat:appcompat:1.0.0') {
+        force = true
+    }
+
+    //sdk鎵�闇�渚濊禆
+    implementation 'androidx.recyclerview:recyclerview:1.0.0'
+    implementation 'com.squareup.okhttp3:logging-interceptor:3.12.0'
+    //firebase
+    implementation(platform("com.google.firebase:firebase-bom:32.2.2"))
+    implementation 'com.google.firebase:firebase-analytics'
+    implementation 'com.google.firebase:firebase-auth'
+    // google
+    implementation 'com.google.android.gms:play-services-auth:20.6.0'
+    // facebook
+    implementation 'com.facebook.android:facebook-login:16.2.0'
+    implementation 'androidx.activity:activity-compose:1.3.1'
+    // google 鏀粯
+    implementation 'com.android.billingclient:billing:6.0.1'
+    implementation 'androidx.fragment:fragment:1.3.2'
+    // adjust 锛圴1.0.2鏂板锛�
+    implementation 'com.adjust.sdk:adjust-android:4.33.5'
+    implementation 'com.android.installreferrer:installreferrer:2.2'
+    implementation 'com.google.android.gms:play-services-ads-identifier:18.0.1'
+    implementation 'com.google.android.gms:play-services-appset:16.0.2'
+}

--
Gitblit v1.8.0