Merge branch 'feat-1.3.1.1' into 'main'

feat(app): 升级1.3.1.1

See merge request !8

build.gradle

 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.1.0' apply false
-    id 'com.android.library' version '8.1.0' apply false
-    id 'org.jetbrains.kotlin.android' version '1.8.10' apply false
-    id 'com.google.firebase.crashlytics' version '3.0.2' apply false
+    id 'com.android.application' version '8.6.0' apply false
+    id 'com.android.library' version '8.6.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
     id 'com.google.gms.google-services' version '4.3.15' apply false
+    id 'com.google.firebase.crashlytics' version '3.0.2' apply false
+//    id 'org.jetbrains.kotlin.jvm' version '1.9.20' apply false
 }
 apply from: 'config.gradle'
\ No newline at end of file

game_demo/build.gradle

 plugins {
     id 'com.android.application'
-    id 'com.google.gms.google-services'
     id 'org.jetbrains.kotlin.android'
+    id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
 }
 
 android {
+    compileSdkVersion 35
     namespace "com.hoolai.oversea.access"
-    compileSdk 34
+
     defaultConfig {
         applicationId "com.hoolai.oversea.access"
         minSdkVersion 23
-        targetSdkVersion 34
+        targetSdkVersion 35
         versionCode 24
         versionName "1.2.4"
 
@@ -48,23 +49,23 @@ android {
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     //hoolai-core（必接）
-    implementation 'com.hoolai.access.open:hoolai-core:1.0.4.0-global'
+    implementation 'com.hoolai.access.open:hoolai-core:1.3.1.1-global'
     //access-native（必接）
-    implementation 'com.hoolai.access.platform:access-native:0.1.2.1425-global'
+    implementation 'com.hoolai.access.platform:access-native:1.3.1.1-global'
     //fangzhou（必接）
-    implementation 'com.hoolai.access.open.fangzhou:fangzhou:4.5.16.10'
+    implementation 'com.hoolai.access.open.fangzhou:fangzhou:4.5.16.12'
     //基础功能模块，登录/支付/分享等（必接）
-    implementation 'com.hoolai.oversea:hl-oversea-global:1.0.5.0'
+    implementation 'com.hoolai.oversea:hl-oversea-global:1.3.1.1'
     //aihelp（必接）
     implementation 'com.hoolai.oversea.aihelp:aihelp:1.0.0.1'
     //appsflyer（必接）
     implementation 'com.hoolai.oversea.appsflyer:appsflyer:1.0.0.2'
     //firebase（必接）
-    implementation 'com.hoolai.oversea.firebase:firebase:1.0.1.0'
+    implementation 'com.hoolai.oversea.firebase:firebase:1.3.1.0'
     //facebooklinks（必接）
     implementation 'com.hoolai.oversea.links:facebooklinks:1.0.1.0'
     //openInstall（选接）
     implementation 'com.hoolai.oversea.opins:openInstall:1.0.0.0'
-    //crashlytics（废弃⚠️）注意crash已经合入到 firebase 插件中了，此处不需要单独引入了！！！
+    //crashlytics（⚠️该库已废弃，和firebase类库已合并,使用需进行相关配置）
     //implementation 'com.hoolai.oversea.crash:crashlytics:1.0.0.0'
 }
\ No newline at end of file

game_demo/src/main/java/com/hoolai/access/demo/ShareActivity.java

@@ -112,10 +112,14 @@ public class ShareActivity extends Activity {
             FastSdk.share(ShareType.SYSTEM, ShareType.ChildType.SYSTEM_FILE, shareParams);*/
 
             //Facebook视频分享
-            ShareParams shareParams = new ShareParams();
+            /*ShareParams shareParams = new ShareParams();
             shareParams.setTitle("泰裤辣");
             shareParams.setPicPath(data1.toString());
-            FastSdk.share(ShareType.FACEBOOK, ShareType.ChildType.FACEBOOK_VIDEO, shareParams);
+            FastSdk.share(ShareType.FACEBOOK, ShareType.ChildType.FACEBOOK_VIDEO, shareParams);*/
+            ShareParams shareParams = new ShareParams();
+            shareParams.setTitle("系统视频分享");
+            shareParams.setPicPath(data1.toString());
+            FastSdk.share(ShareType.SYSTEM, ShareType.ChildType.SYSTEM_FILE, shareParams);
         }
     }
 }

gradle/wrapper/gradle-wrapper.properties

+#Tue Aug 01 10:56:45 CST 2023
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
-networkTimeout=10000
-validateDistributionUrl=true
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

settings.gradle

 pluginManagement {
     repositories {
-//        mavenLocal()
         google()
         mavenCentral()
         maven {
@@ -12,7 +11,6 @@ dependencyResolutionManagement {
 
     repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
     repositories {
-//        mavenLocal()
         google()
         mavenCentral()
         maven {
@@ -20,5 +18,6 @@ dependencyResolutionManagement {
         }
     }
 }
+
 rootProject.name = "hoolai-oversea-demo-new"
 include ':game_demo'