From 5b502ce2aa30e49f8ecafbd1fafc4e127fb214dc Mon Sep 17 00:00:00 2001
From: Randy Tan Shaoxian <oneseedfruit@gmail.com>
Date: Sat, 26 Mar 2022 19:19:18 +0800
Subject: [PATCH] Updated to be used with Godot 3.4.3, updated gradle and
 Kotlin version

---
 .gitignore                                      |  1 +
 .idea/compiler.xml                              |  2 +-
 .idea/jarRepositories.xml                       |  5 +++++
 .idea/misc.xml                                  |  3 ++-
 .idea/vcs.xml                                   |  6 ------
 Changelog.md                                    | 17 -----------------
 app/build.gradle                                | 15 +++++++--------
 .../cgisca/godot/gpgs/PlayGameServicesGodot.kt  |  6 ++++--
 .../gpgs/accountinfo/PlayerInfoController.kt    | 10 +++++-----
 .../gpgs/leaderboards/LeaderboardsController.kt | 10 ++++++----
 .../gpgs/savedgames/SavedGamesController.kt     |  4 +++-
 build.gradle                                    | 11 +++++++----
 godot-lib/build.gradle                          |  2 --
 gradle/wrapper/gradle-wrapper.properties        |  6 +++---
 settings.gradle                                 |  2 +-
 15 files changed, 45 insertions(+), 55 deletions(-)
 delete mode 100644 .idea/vcs.xml
 delete mode 100644 Changelog.md
 delete mode 100644 godot-lib/build.gradle

diff --git a/.gitignore b/.gitignore
index 56bb51f..863c5d0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -50,6 +50,7 @@ captures/
 .idea/modules.xml
 # Comment next line if keeping position of elements in Navigation Editor is relevant for you
 .idea/navEditor.xml
+.idea/vcs.xml
 
 # Keystore files
 # Uncomment the following lines if you do not want to check your keystore files in.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
+    <bytecodeTargetLevel target="11" />
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
index a5f05cd..e34606c 100644
--- a/.idea/jarRepositories.xml
+++ b/.idea/jarRepositories.xml
@@ -21,5 +21,10 @@
       <option name="name" value="Google" />
       <option name="url" value="https://dl.google.com/dl/android/maven2/" />
     </remote-repository>
+    <remote-repository>
+      <option name="id" value="MavenRepo" />
+      <option name="name" value="MavenRepo" />
+      <option name="url" value="https://repo.maven.apache.org/maven2/" />
+    </remote-repository>
   </component>
 </project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 58918f5..c124186 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7..0000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
\ No newline at end of file
diff --git a/Changelog.md b/Changelog.md
deleted file mode 100644
index e385c89..0000000
--- a/Changelog.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Changelog
-
-### 1.2.0
-Added posibility to enable/disable saved games functionality.
-Fixed bug in saved games functionality.
-
-### 1.1.0
-Fix crash when trying to sign in
-
-### 1.0.0
-Implemented Google play games services features:
-- Sign-in/Sign out
-- Achievements
-- Leaderboards
-- Events
-- Player Stats
-- Saved Games
diff --git a/app/build.gradle b/app/build.gradle
index 89a26f0..e54396f 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -1,14 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
-apply plugin: 'kotlin-android-extensions'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "30.0.1"
+    compileSdkVersion 32
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         minSdkVersion 21
-        targetSdkVersion 29
+        targetSdkVersion 32
         versionCode 1
         versionName "1.0"
     }
@@ -34,11 +33,11 @@ android {
 }
 
 dependencies {
-    compileOnly project(":godot-lib")
+    compileOnly fileTree(dir:"libs", include:["godot-lib.aar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
-    implementation 'com.google.android.gms:play-services-games:21.0.0'
-    implementation 'com.google.android.gms:play-services-auth:19.0.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.android.gms:play-services-games:22.0.1'
+    implementation 'com.google.android.gms:play-services-auth:20.1.0'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     testImplementation 'junit:junit:4.13.2'
 }
diff --git a/app/src/main/java/io/cgisca/godot/gpgs/PlayGameServicesGodot.kt b/app/src/main/java/io/cgisca/godot/gpgs/PlayGameServicesGodot.kt
index 18e0966..2b3c64c 100644
--- a/app/src/main/java/io/cgisca/godot/gpgs/PlayGameServicesGodot.kt
+++ b/app/src/main/java/io/cgisca/godot/gpgs/PlayGameServicesGodot.kt
@@ -159,8 +159,10 @@ class PlayGameServicesGodot(godot: Godot) : GodotPlugin(godot), AchievementsList
 
     override fun onMainActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
         if (requestCode == SignInController.RC_SIGN_IN) {
-            val googleSignInResult = Auth.GoogleSignInApi.getSignInResultFromIntent(data)
-            signInController.onSignInActivityResult(googleSignInResult)
+            if (data != null) {
+                val googleSignInResult = Auth.GoogleSignInApi.getSignInResultFromIntent(data)
+                signInController.onSignInActivityResult(googleSignInResult)
+            }
         } else if (requestCode == SavedGamesController.RC_SAVED_GAMES) {
             if (data != null) {
                 if (data.hasExtra(SnapshotsClient.EXTRA_SNAPSHOT_METADATA)) {
diff --git a/app/src/main/java/io/cgisca/godot/gpgs/accountinfo/PlayerInfoController.kt b/app/src/main/java/io/cgisca/godot/gpgs/accountinfo/PlayerInfoController.kt
index b99a69f..d666459 100644
--- a/app/src/main/java/io/cgisca/godot/gpgs/accountinfo/PlayerInfoController.kt
+++ b/app/src/main/java/io/cgisca/godot/gpgs/accountinfo/PlayerInfoController.kt
@@ -23,20 +23,20 @@ class PlayerInfoController(
                     val player = task.result
                     if (task.isSuccessful && player != null) {
                         val levelInfo = player.levelInfo
-                        val playerLevelInfo = if (levelInfo != null) {
+                        val playerLevelInfo = if (levelInfo !== null) {
                             PlayerLevelInfo(
                                 levelInfo.currentXpTotal,
                                 levelInfo.lastLevelUpTimestamp,
-                                if (levelInfo.currentLevel != null) PlayerLevel(
+                                PlayerLevel(
                                     levelInfo.currentLevel.levelNumber,
                                     levelInfo.currentLevel.minXp,
                                     levelInfo.currentLevel.maxXp
-                                ) else null,
-                                if (levelInfo.nextLevel != null) PlayerLevel(
+                                ),
+                                PlayerLevel(
                                     levelInfo.nextLevel.levelNumber,
                                     levelInfo.nextLevel.minXp,
                                     levelInfo.nextLevel.maxXp
-                                ) else null
+                                )
                             )
                         } else {
                             null
diff --git a/app/src/main/java/io/cgisca/godot/gpgs/leaderboards/LeaderboardsController.kt b/app/src/main/java/io/cgisca/godot/gpgs/leaderboards/LeaderboardsController.kt
index 8a94fd3..5cc780e 100644
--- a/app/src/main/java/io/cgisca/godot/gpgs/leaderboards/LeaderboardsController.kt
+++ b/app/src/main/java/io/cgisca/godot/gpgs/leaderboards/LeaderboardsController.kt
@@ -29,15 +29,15 @@ class LeaderboardsController(
 
         var collection = COLLECTION_PUBLIC
 
-        if (leaderboardCollection.toLowerCase(Locale.ROOT).contains("friends")) {
+        if (leaderboardCollection.lowercase(Locale.ROOT).contains("friends")) {
             collection = COLLECTION_FRIENDS
         }
 
         var finalSpan = TIME_SPAN_ALL_TIME;
 
-        if (span.toLowerCase(Locale.ROOT).contains("weekly")) {
+        if (span.lowercase(Locale.ROOT).contains("weekly")) {
             finalSpan = TIME_SPAN_WEEKLY
-        } else if (span.toLowerCase(Locale.ROOT).contains("daily")) {
+        } else if (span.lowercase(Locale.ROOT).contains("daily")) {
             finalSpan = TIME_SPAN_DAILY
         }
 
@@ -55,7 +55,9 @@ class LeaderboardsController(
 
                     if (lbScore != null) {
                         val score = lbScore.get();
-                        Log.i("godot", "-------------------\n\n THE RESULT:\n ${score.rank}\n\n")
+                        if (score != null) {
+                            Log.i("godot", "-------------------\n\n THE RESULT:\n ${score.rank}\n\n")
+                        }
 
                         if (score != null) {
                             leaderboardScore.rank = score.rank
diff --git a/app/src/main/java/io/cgisca/godot/gpgs/savedgames/SavedGamesController.kt b/app/src/main/java/io/cgisca/godot/gpgs/savedgames/SavedGamesController.kt
index 9e0c75d..592b4dc 100644
--- a/app/src/main/java/io/cgisca/godot/gpgs/savedgames/SavedGamesController.kt
+++ b/app/src/main/java/io/cgisca/godot/gpgs/savedgames/SavedGamesController.kt
@@ -47,7 +47,9 @@ class SavedGamesController(
         data: ByteArray?,
         desc: String
     ) {
-        snapshot.snapshotContents.writeBytes(data)
+        if (data != null) {
+            snapshot.snapshotContents.writeBytes(data)
+        }
         val metadataChange = SnapshotMetadataChange.Builder()
             .setDescription(desc)
             .build()
diff --git a/build.gradle b/build.gradle
index 6605345..c61dcf9 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,12 +1,15 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = '1.4.31'
+    ext {
+        agp_version = '7.1.2'
+    }
+    ext.kotlin_version = '1.6.10'
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.1.0"
+        classpath "com.android.tools.build:gradle:$agp_version"
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong
@@ -17,7 +20,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 
diff --git a/godot-lib/build.gradle b/godot-lib/build.gradle
deleted file mode 100644
index d7af590..0000000
--- a/godot-lib/build.gradle
+++ /dev/null
@@ -1,2 +0,0 @@
-configurations.maybeCreate("default")
-artifacts.add("default", file('godot-lib.3.3.2.stable.release.aar'))
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index 23ec0f0..fc7fc95 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Thu Jul 23 22:14:23 EEST 2020
+#Sat Mar 26 08:33:05 MYT 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/settings.gradle b/settings.gradle
index d940618..9d495b3 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':godot-lib'
\ No newline at end of file
+include ':app'
\ No newline at end of file