Update sdkVersion, gradle 8.2, and java 17 (#76)

godot-sdk-integrations · Jan 21, 2025 · 3a61cbb · 3a61cbb
1 parent 1196bdd
commit 3a61cbb
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 35 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/GodotGooglePlayBilling.gdap b/GodotGooglePlayBilling.gdap
@@ -2,7 +2,7 @@
 
 name="GodotGooglePlayBilling"
 binary_type="local"
-binary="GodotGooglePlayBilling.1.2.0.release.aar"
+binary="GodotGooglePlayBilling.1.3.0.release.aar"
 
 [dependencies]
 remote=["com.android.billingclient:billing:7.0.0"]
diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,10 @@
 buildscript {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
     dependencies {
-        classpath "com.android.tools.build:gradle:4.0.0"
+        classpath "com.android.tools.build:gradle:8.2.0"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -15,7 +15,7 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
+        mavenCentral()
     }
 }
 

diff --git a/godot-google-play-billing/build.gradle b/godot-google-play-billing/build.gradle
@@ -2,20 +2,25 @@ plugins {
     id 'com.android.library'
 }
 
-ext.pluginVersionCode = 5
-ext.pluginVersionName = "1.2.0"
+ext.pluginVersionCode = 6
+ext.pluginVersionName = "1.3.0"
 
 android {
-    compileSdkVersion 31
-    buildToolsVersion "30.0.3"
+    namespace 'org.godotengine.godot.plugin.googleplaybilling'
+    compileSdkVersion 34
 
     defaultConfig {
-        minSdkVersion 18
-        targetSdkVersion 31
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode pluginVersionCode
         versionName pluginVersionName
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
     libraryVariants.all { variant ->
         variant.outputs.all { output ->
             output.outputFileName = "GodotGooglePlayBilling.$pluginVersionName.${variant.name}.aar"

diff --git a/godot-google-play-billing/src/main/AndroidManifest.xml b/godot-google-play-billing/src/main/AndroidManifest.xml
@@ -1,6 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.godotengine.godot.plugin.googleplaybilling">
-
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <application>
 
         <meta-data

diff --git a/.../src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java b/.../src/main/java/org/godotengine/godot/plugin/googleplaybilling/GodotGooglePlayBilling.java
@@ -1,5 +1,5 @@
 /*************************************************************************/
-/*  GodotGooglePlayBilling.java                                                    */
+/*  GodotGooglePlayBilling.java                                          */
 /*************************************************************************/
 /*                       This file is part of:                           */
 /*                           GODOT ENGINE                                */

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Mon Jun 15 13:39:16 CEST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip