Merge pull request #132 from Poing-Studios/#127

#127 Upgrade version from 20.4.0 to 21.1.0 Former-commit-id: 24bd632
poingstudios · Aug 27, 2022 · eeb5271 · eeb5271
2 parents 7ca9342 + f83ee97
commit eeb5271
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 11 deletions.
diff --git a/.github/workflows/manual_release_android.yml b/.github/workflows/manual_release_android.yml
@@ -7,7 +7,7 @@ on:
         description: 'Tag to publish the build (e.g., v2.0.1)'
         required: true
       godot_version:
-        description: 'Godot version to be builded (e.g., 3.4.3)'
+        description: 'Godot version to be builded (e.g., 3.5)'
         required: true
 
 jobs:

diff --git a/...hub/workflows/release_android_v3_2_2+.yml → .github/workflows/release_android.yml b/...hub/workflows/release_android_v3_2_2+.yml → .github/workflows/release_android.yml
@@ -6,8 +6,8 @@ on:
       - '*'
 
 env:
-  TAG_NAME: Android_v3.2.2+
-  RELEASE_NAME: Android Compiled files for v3.2.2+
+  TAG_NAME: Android_v3.5+
+  RELEASE_NAME: Android Compiled files for v3.5+
 
 jobs:
   android-template:
@@ -16,7 +16,7 @@ jobs:
     strategy:
       matrix:
         RELEASE_VERSIONS: ["standard", "mono"]
-        GODOT_VERSIONS: [3.2.2, 3.2.3, 3.3, 3.3.1, 3.3.2, 3.3.3, 3.3.4, 3.4, 3.4.1, 3.4.2, 3.4.3, 3.4.4, 3.4.5, 3.5]
+        GODOT_VERSIONS: [3.5]
 
     steps:
     - uses: actions/checkout@v2

diff --git a/README.md b/README.md
@@ -17,7 +17,7 @@
     <img src="https://github.com/Poing-Studios/godot-admob-android/workflows/Build%20Android/badge.svg">
   </a>
   <a href="https://github.com/Poing-Studios/godot-admob-android/blob/master/admob/build.gradle#L30">
-    <img src="https://img.shields.io/badge/GAD%20SDK%20Android-v20.4.0-informational">
+    <img src="https://img.shields.io/badge/GAD%20SDK%20Android-v21.1.0-informational">
   </a>
   <a href="https://github.com/Poing-Studios/godot-admob-android/releases">
     <img src="https://img.shields.io/github/downloads/Poing-Studios/godot-admob-android/total?style=social">

diff --git a/admob/build.gradle b/admob/build.gradle
@@ -7,8 +7,6 @@ android {
     defaultConfig {
         minSdkVersion 19
         targetSdkVersion 32
-        versionCode 1
-        versionName "1.0"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles 'consumer-rules.pro'
@@ -27,10 +25,10 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     compileOnly project(':godot-lib')
-    implementation 'com.google.android.gms:play-services-ads:20.4.0'
+    implementation 'com.google.android.gms:play-services-ads:21.1.0'
     implementation 'com.google.android.ump:user-messaging-platform:2.0.0'
 
-    implementation 'androidx.appcompat:appcompat:1.4.2'
+    implementation 'androidx.appcompat:appcompat:1.5.0'
     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/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.2'
 
 
         // NOTE: Do not place your application dependencies here; they belong

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
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME