From d8fc939d4e6e0a8748a5a87e32c2d0bf219d0a5f Mon Sep 17 00:00:00 2001
From: lwb <q3213421wrwqr>
Date: 星期二, 23 三月 2021 15:53:31 +0800
Subject: [PATCH] 升级 Android X
---
SdkProject/channel/qkbt2game/AndroidManifest.xml | 2 +-
SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java | 4 ++--
Channel/Android/gtgame/release/libs/library-release-gtgame.aar | 0
SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java | 8 ++++----
SdkProject/library/build.gradle | 2 +-
SdkProject/channel/GTGame/AndroidManifest.xml | 2 +-
SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java | 2 +-
SdkProject/channel/GTGame/deps.gradle | 8 ++++----
SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.6.jar | 0
Channel/Android/gtgame/deps.gradle | 8 ++++----
/dev/null | 0
Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar | 0
SdkProject/app/build.gradle | 4 ++--
SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java | 2 +-
SdkProject/gradle.properties | 6 +++---
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java | 2 +-
SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java | 2 +-
17 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar b/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
index 11e8621..c767ec7 100644
--- a/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
+++ b/Channel/Android/gtgame/debug/libs/library-debug-gtgame.aar
Binary files differ
diff --git a/Channel/Android/gtgame/deps.gradle b/Channel/Android/gtgame/deps.gradle
index 305a708..dc6fb3c 100644
--- a/Channel/Android/gtgame/deps.gradle
+++ b/Channel/Android/gtgame/deps.gradle
@@ -1,8 +1,8 @@
dependencies {
- implementation 'com.google.android.gms:play-services-auth:15.0.1'
- implementation "com.android.billingclient:billing:2.0.3"
- implementation 'com.facebook.android:facebook-login:[5,6)'
- implementation 'com.facebook.android:facebook-share:[5,6)'
+ implementation 'com.google.android.gms:play-services-auth:17.0.0'
+ implementation "com.android.billingclient:billing:3.0.0"
+ implementation 'com.facebook.android:facebook-login:9.1.0'
+ implementation 'com.facebook.android:facebook-share:9.1.0'
implementation 'com.google.android.play:core:1.8.2'
}
dependencies {
diff --git a/Channel/Android/gtgame/release/libs/library-release-gtgame.aar b/Channel/Android/gtgame/release/libs/library-release-gtgame.aar
index dd0d54d..4094d20 100644
--- a/Channel/Android/gtgame/release/libs/library-release-gtgame.aar
+++ b/Channel/Android/gtgame/release/libs/library-release-gtgame.aar
Binary files differ
diff --git a/SdkProject/app/build.gradle b/SdkProject/app/build.gradle
index e67e35d..40bedcc 100644
--- a/SdkProject/app/build.gradle
+++ b/SdkProject/app/build.gradle
@@ -29,9 +29,9 @@
dependencies {
implementation project(path: ':library')
- implementation 'com.android.support:support-annotations:28.0.0'
+ implementation 'androidx.annotation:annotation:1.0.0'
androidTestImplementation 'junit:junit:4.13.1'
//noinspection GradleCompatible
- implementation 'com.android.support:appcompat-v7:28.0.0'
+ implementation 'androidx.appcompat:appcompat:1.0.0'
implementation fileTree(dir: 'libs', include: ['*.jar'])
}
\ No newline at end of file
diff --git a/SdkProject/channel/GTGame/AndroidManifest.xml b/SdkProject/channel/GTGame/AndroidManifest.xml
index 4b14fed..a5b2f8a 100644
--- a/SdkProject/channel/GTGame/AndroidManifest.xml
+++ b/SdkProject/channel/GTGame/AndroidManifest.xml
@@ -73,7 +73,7 @@
android:theme="@style/yyj_sdk_activity_transparent" />
<provider
- android:name="android.support.v4.content.FileProvider"
+ android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.fileprovider"
android:exported="false"
android:grantUriPermissions="true">
diff --git a/SdkProject/channel/GTGame/deps.gradle b/SdkProject/channel/GTGame/deps.gradle
index 7719679..1444fc0 100644
--- a/SdkProject/channel/GTGame/deps.gradle
+++ b/SdkProject/channel/GTGame/deps.gradle
@@ -1,7 +1,7 @@
dependencies {
- implementation 'com.google.android.gms:play-services-auth:15.0.1'
- implementation "com.android.billingclient:billing:2.0.3"
- implementation 'com.facebook.android:facebook-login:[5,6)'
- implementation 'com.facebook.android:facebook-share:[5,6)'
+ implementation 'com.google.android.gms:play-services-auth:17.0.0'
+ implementation "com.android.billingclient:billing:3.0.0"
+ implementation 'com.facebook.android:facebook-login:9.1.0'
+ implementation 'com.facebook.android:facebook-share:9.1.0'
implementation 'com.google.android.play:core:1.8.2'
}
diff --git a/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar b/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar
deleted file mode 100644
index d48f71a..0000000
--- a/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.5.jar
+++ /dev/null
Binary files differ
diff --git a/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.6.jar b/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.6.jar
new file mode 100644
index 0000000..5f5b632
--- /dev/null
+++ b/SdkProject/channel/GTGame/libs/fjsanxia_syh5_1.1.6.jar
Binary files differ
diff --git a/SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java b/SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java
index 71e4ff2..5d8a096 100644
--- a/SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java
+++ b/SdkProject/channel/gtgame/java/com/secondworld/sdk/GTGameMain.java
@@ -1,7 +1,7 @@
package com.secondworld.sdk;
import android.app.Activity;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import com.cy.yyjia.sdk.center.SdkManager;
diff --git a/SdkProject/channel/qkbt2game/AndroidManifest.xml b/SdkProject/channel/qkbt2game/AndroidManifest.xml
index f141333..cd1ba66 100644
--- a/SdkProject/channel/qkbt2game/AndroidManifest.xml
+++ b/SdkProject/channel/qkbt2game/AndroidManifest.xml
@@ -28,7 +28,7 @@
</activity>
<provider
- android:name="android.support.v4.content.FileProvider"
+ android:name="androidx.core.content.FileProvider"
android:authorities="quicksdk_packName.Provider"
android:exported="false"
android:grantUriPermissions="true">
diff --git a/SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java b/SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java
index 3878320..68eebcd 100644
--- a/SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java
+++ b/SdkProject/channel/qkbt2game/java/com/secondworld/sdk/BtGameMain.java
@@ -4,7 +4,7 @@
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.KeyEvent;
import com.quicksdk.QuickSDK;
diff --git a/SdkProject/gradle.properties b/SdkProject/gradle.properties
index 4af83fa..3479196 100644
--- a/SdkProject/gradle.properties
+++ b/SdkProject/gradle.properties
@@ -14,8 +14,8 @@
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
-android.useAndroidX=false
+android.useAndroidX=true
## Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=false
+android.enableJetifier=true
#褰撳墠鏋勫缓鐨勬笭閬撳悕绉�
-CHANNEL_NAME=qkbt2game
+CHANNEL_NAME=gtgame
\ No newline at end of file
diff --git a/SdkProject/library/build.gradle b/SdkProject/library/build.gradle
index 0fc6fa5..1857d2c 100644
--- a/SdkProject/library/build.gradle
+++ b/SdkProject/library/build.gradle
@@ -180,7 +180,7 @@
}
dependencies {
- implementation 'com.android.support:support-annotations:28.0.0'
+ implementation 'androidx.annotation:annotation:1.0.0'
testImplementation 'junit:junit:4.13.2'
//noinspection GradleCompatible
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
index 60f3663..2d71129 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivity.java
@@ -2,7 +2,7 @@
import android.content.Intent;
import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.KeyEvent;
import android.widget.FrameLayout;
import android.widget.RelativeLayout;
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
index 409a520..fb9245f 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/GameActivityProxy.java
@@ -2,7 +2,7 @@
import android.app.Activity;
import android.content.Intent;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.view.KeyEvent;
diff --git a/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java b/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
index e49a265..8797abd 100644
--- a/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
+++ b/SdkProject/library/src/main/java/com/secondworld/sdk/PermissionManager.java
@@ -2,10 +2,10 @@
import android.app.Activity;
import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v4.content.PermissionChecker;
+import androidx.annotation.NonNull;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.core.content.PermissionChecker;
import com.secondworld.sdk.utils.CallBackState;
import com.secondworld.sdk.utils.CodeA2U;
diff --git a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
index a4b0e47..73d075c 100644
--- a/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
+++ b/SdkProject/plugins/quick/java/com/secondworld/sdk/QuickSdkMgr.java
@@ -9,8 +9,8 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
import android.widget.Toast;
import com.quicksdk.BaseCallBack;
--
Gitblit v1.8.0