Updated to work with Godot 3.3.

oneseedfruit · Apr 22, 2021 · 70fe523 · 70fe523
1 parent bdf7ddd
commit 70fe523
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -7,7 +7,7 @@ android {
     buildToolsVersion "30.0.1"
 
     defaultConfig {
-        minSdkVersion 16
+        minSdkVersion 21
         targetSdkVersion 29
         versionCode 1
         versionName "1.0"
@@ -34,12 +34,12 @@ android {
 }
 
 dependencies {
-    compileOnly project(":godot-lib.3.2.3.stable.release")
+    compileOnly project(":godot-lib")
     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'
 
-    testImplementation 'junit:junit:4.13'
+    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
@@ -193,16 +193,16 @@ class PlayGameServicesGodot(godot: Godot) : GodotPlugin(godot), AchievementsList
             signInOptionsBuilder.build()
         }
 
-        connectionController = ConnectionController(godot as Activity, signInOptions)
-        signInController = SignInController(godot as Activity, this, connectionController)
-        achievementsController = AchievementsController(godot as Activity, this, connectionController)
-        leaderboardsController = LeaderboardsController(godot as Activity, this, connectionController)
-        eventsController = EventsController(godot as Activity, this, connectionController)
-        playerStatsController = PlayerStatsController(godot as Activity, this, connectionController)
-        playerInfoController = PlayerInfoController(godot as Activity, this, connectionController)
-        savedGamesController = SavedGamesController(godot as Activity, this, connectionController)
-
-        googleSignInClient = GoogleSignIn.getClient(godot as Activity, signInOptions)
+        connectionController = ConnectionController(godot.activity as Activity, signInOptions)
+        signInController = SignInController(godot.activity as Activity, this, connectionController)
+        achievementsController = AchievementsController(godot.activity as Activity, this, connectionController)
+        leaderboardsController = LeaderboardsController(godot.activity as Activity, this, connectionController)
+        eventsController = EventsController(godot.activity as Activity, this, connectionController)
+        playerStatsController = PlayerStatsController(godot.activity as Activity, this, connectionController)
+        playerInfoController = PlayerInfoController(godot.activity as Activity, this, connectionController)
+        savedGamesController = SavedGamesController(godot.activity as Activity, this, connectionController)
+
+        googleSignInClient = GoogleSignIn.getClient(godot.activity as Activity, signInOptions)
 
         runOnUiThread {
             signInController.setShowPopups(enablePopups)

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
-    ext.kotlin_version = "1.4.10"
+    ext.kotlin_version = '1.4.31'
     repositories {
         google()
         jcenter()

diff --git a/godot-lib.3.2.3.stable.release/build.gradle b/godot-lib.3.2.3.stable.release/build.gradle
diff --git a/godot-lib/build.gradle b/godot-lib/build.gradle
@@ -0,0 +1,2 @@
+configurations.maybeCreate("default")
+artifacts.add("default", file('godot-lib.3.3.stable.release.aar'))
diff --git a/settings.gradle b/settings.gradle
@@ -1 +1 @@
-include ':app', ':godot-lib.3.2.3.stable.release'
+include ':app', ':godot-lib'