Merge pull request #235 from kyoz/v2

feat: LTS for android, using play-services-ads:23.0.0
poingstudios · Sep 3, 2024 · b91cd34 · b91cd34
2 parents 3c0d3af + f66d379
commit b91cd34
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 26 deletions.
diff --git a/admob/AdMob.gdap b/admob/AdMob.gdap
@@ -6,4 +6,4 @@ binary="admob-release.aar"
 
 [dependencies]
 
-remote=["com.google.android.gms:play-services-ads:22.0.0"]
+remote=["com.google.android.gms:play-services-ads:23.0.0"]
diff --git a/admob/build.gradle b/admob/build.gradle
@@ -1,12 +1,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion '32.0.0'
+    compileSdkVersion 34
+    buildToolsVersion '33.0.1'
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 32
+        minSdkVersion 21
+        targetSdkVersion 34
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -18,7 +18,11 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.poing.admob'
 
+    buildFeatures {
+        buildConfig = true
+    }
 }
 
 dependencies {
@@ -38,6 +42,4 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.5.1'
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }
diff --git a/admob/src/main/AndroidManifest.xml b/admob/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.poing.admob">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <application>

diff --git a/admob/src/main/java/com/poing/admob/AdMob.java b/admob/src/main/java/com/poing/admob/AdMob.java
@@ -75,7 +75,7 @@
 import java.util.Set;
 
 public class AdMob extends org.godotengine.godot.plugin.GodotPlugin {
-    private static final String PLUGIN_VERSION = "2.1.6";
+    private static final String PLUGIN_VERSION = "2.1.7";
     private static final String LOG_TAG_NAME = "poing-godot-admob";
     private boolean aIsInitialized = false;
     private String aInitializationDesc = "";

diff --git a/admob/version.txt b/admob/version.txt
@@ -1 +1 @@
-2.1.5
+2.1.6
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,13 +1,14 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 32
-    buildToolsVersion '32.0.0'
+
+    compileSdkVersion 34
+    buildToolsVersion '33.0.1'
 
     defaultConfig {
         applicationId "com.poing.admob"
-        minSdkVersion 19
-        targetSdkVersion 32
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1
         versionName "1.0"
 
@@ -20,14 +21,13 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'com.poing.admob'
 
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    implementation 'androidx.appcompat:appcompat:1.5.1'
+    testImplementation 'junit:junit:4.13.2'
 }
diff --git a/...g/godotadmob/ExampleInstrumentedTest.java → .../poing/admob/ExampleInstrumentedTest.java b/...g/godotadmob/ExampleInstrumentedTest.java → .../poing/admob/ExampleInstrumentedTest.java
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.poing.admob">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/...com/poing/godotadmob/ExampleUnitTest.java → ...java/com/poing/admob/ExampleUnitTest.java b/...com/poing/godotadmob/ExampleUnitTest.java → ...java/com/poing/admob/ExampleUnitTest.java
diff --git a/build.gradle b/build.gradle
@@ -8,8 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.2.2'
-
+        classpath ('com.android.tools.build:gradle:8.1.4')
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
@@ -17,4 +17,6 @@ org.gradle.jvmargs=-Xmx1536m
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Wed Jun 22 23:27:15 BRT 2022
+#Mon Sep 02 21:18:55 BRT 2024
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
-zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
Original file line number	Diff line number	Diff line change
Expand Up		@@ -6,4 +6,4 @@ binary="admob-release.aar"

		[dependencies]

		remote=["com.google.android.gms:play-services-ads:22.0.0"]
		remote=["com.google.android.gms:play-services-ads:23.0.0"]