Updated gradle, kotlin and other fixes

LICENSE

@@ -14,7 +14,7 @@ copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
 IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+FITNESS FOR A PARTICULAR PURPOSE AND NON INFRINGEMENT. IN NO EVENT SHALL THE
 AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE

README.md

@@ -38,20 +38,20 @@ To understand how to use plugins in Godot refer to [Godot docs](https://docs.god
 
 List of plugins or modules:
 
-| Plugin or Module | Description | Supported API Version |
-| ---------------- | ----------- | --------------------- |
-| [AppNotification](app-notification/README.md) | Plugin to send local notification in android devices | N.A |
-| [GooglePlayReview](google-play-review/README.md) | Plugin to include in-app review or review link component in your game | com.google.android.play:review:2.0.1 |
-| [GooglePlayBilling](google-play-billing/README.md) | Plugin to integrate google play billing in the game for managing a store | com.android.billingclient:billing:5.1.0 |
+| Plugin or Module                                              | Description                                                                       | Supported API Version                                |
+|---------------------------------------------------------------|-----------------------------------------------------------------------------------|------------------------------------------------------|
+| [AppNotification](app-notification/README.md)                 | Plugin to send local notification in android devices                              | N.A                                                  |
+| [GooglePlayReview](google-play-review/README.md)              | Plugin to include in-app review or review link component in your game             | com.google.android.play:review:2.0.1                 |
+| [GooglePlayBilling](google-play-billing/README.md)            | Plugin to integrate google play billing in the game for managing a store          | com.android.billingclient:billing:5.1.0              |
 | [GooglePlayGameServices](google-play-game-services/README.md) | Plugin to integrate google play game services like achievments, events and others | com.google.android.gms:play-services-games-v2:17.0.0 |
 
 
 ### External Plugins (Reference):
 Below are list of plugins which have not been added, as implementation by the user is well supported.
 
-| Plugin or Module | Description | Type |
-| ---------------- | ----------- | ---- |
-| [godot-sqlite](https://github.com/2shady4u/godot-sqlite) | Godot plugin for integrating SQLite DB into the game | Native |
+| Plugin or Module                                                     | Description                                                 | Type   |
+|----------------------------------------------------------------------|-------------------------------------------------------------|--------|
+| [godot-sqlite](https://github.com/2shady4u/godot-sqlite)             | Godot plugin for integrating SQLite DB into the game        | Native |
 | [GodotAdMob](https://github.com/Shin-NiL/Godot-Android-Admob-Plugin) | Godot plugin for integrating Admob Ad Network into the game | Plugin |
 
 ### Contributing and Support
@@ -61,13 +61,15 @@ If you are facing a problem in usage, raise an issue providing details about the
 
 ### Developer Notes
 
-      Godot Engine Version(Minimum) - 3.5 (stable)
-      Android SDK (Minimum) - 23 (Build.VERSION_CODES.O)
-      Android SDK (Target) - 32 (Build.VERSION_CODES.S_V2)
-      Java Version(jdk)(Minimum) - 11
-      Kotlin version(Minimum) - 1.6.21
-      Android Gradle Plugin Version - 7.2.2
-      Gradle Version - 7.5.1
+|                       | Minimum                    | Target/Compile                |
+|-----------------------|----------------------------|-------------------------------|
+| Godot Engine Version  | 3.5 (Stable)               |                               |
+| Android SDK           | 23 (Build.VERSION_CODES.O) | 32 (Build.VERSION_CODES.S_V2) |
+| Java Version(jdk)     | 11                         |                               |
+| Kotlin version        | 1.8.0                      |                               |
+| Android Gradle Plugin | 7.4.0                      |                               |
+| Gradle                | 7.6                        |                               |
+
 
 If anything else missed out, please send a note 
 

app-notification/README.md

@@ -250,11 +250,11 @@ Holds the notification info of a notification
 
 ## Developer Notes:
 
-|             | Minimum | Maximum |
-|-------------|---------|---------|
-| Android SDK | 23      | 32      |
-| Java/JDK    | 11      |         |
-| Kotlin      | 1.6.21  |         | 
+|             | Minimum  | Maximum |
+|-------------|----------|---------|
+| Android SDK | 23       | 32      |
+| Java/JDK    | 11       |         |
+| Kotlin      | 1.8.0    |         | 
 
 
 

app-notification/build.gradle.kts

@@ -23,11 +23,12 @@ extra.apply {
 }
 
 android {
+    namespace="gaml.notification"
     compileSdk = 32
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 32
+        //targetSdk = 32
     }
 
     buildTypes {
@@ -52,5 +53,5 @@ apply<GdapPlugin>()
 dependencies{
     compileOnly(fileTree(mapOf("dir" to "$rootDir/libs/", "include" to listOf("godot-lib*.aar"))))
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation(kotlin("stdlib", "1.6.21"))
+//    implementation(kotlin("stdlib", "1.6.21"))
 }

app-notification/src/main/AndroidManifest.xml

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="gaml.notification">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-permission android:name="android.permission.SCHEDULE_EXACT_ALARM" />
-    <uses-permission android:name="android.permission.SET_ALARM" />
+    <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
     <application>
         <meta-data
             android:name="org.godotengine.plugin.v1.AppNotification"

build.gradle.kts

@@ -1,10 +1,3 @@
-import org.jetbrains.kotlin.ir.backend.js.lower.generateJsTests
-
-// Top-level build file where you can add configuration options common to all sub-projects/modules.
-//plugins{
-//    kotlin("kotlin-dsl")
-//
-//}
 tasks.create<Delete>("clean") {
     delete(
         fileTree("bin"),
@@ -18,8 +11,8 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath("com.android.tools.build:gradle:7.2.2")
-        classpath(kotlin("gradle-plugin", "1.6.21"))
+        classpath("com.android.tools.build:gradle:7.4.0")
+        classpath(kotlin("gradle-plugin", "1.8.0"))
         gradleApi()
 
     }

buildSrc/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    kotlin("jvm") version "1.6.21"
+    kotlin("jvm") version "1.8.0"
 }
 
 repositories {
@@ -10,12 +10,12 @@ repositories {
 }
 
 tasks.withType<KotlinCompile>().configureEach {
-    kotlinOptions.apiVersion = "1.6"
+    kotlinOptions.apiVersion = "1.8"
     kotlinOptions.jvmTarget = "11"
 }
 
 dependencies {
-    implementation("com.android.tools.build:gradle-api:7.2.2")
+    implementation("com.android.tools.build:gradle-api:7.4.0")
     implementation(kotlin("stdlib"))
     gradleApi()
 }

google-play-billing/README.md

@@ -98,7 +98,7 @@ Note: For Subscription products various features are not fully supported yet
   - **products [Array(String)]** - list of product_ids purchased
 
 - ##### CustomError:
-  Represnts a custom error with custom error codes when purchase flow is launched
+  Represents a custom error with custom error codes when purchase flow is launched
   - **error_code [String]** - custom error code. possible values are PRODUCT_ID_NOT_IN_CACHE(1), SERVICE_ERROR(2) or NO_ERROR(0)
   - **int_error [Result]** - Internal launch result from billing client if there is any.
 
@@ -241,10 +241,13 @@ Note: For Subscription products various features are not fully supported yet
 
 ### Developer Notes:
 
-    - Android SDK:  Minimum - 23, Target - 32
-    - Java/JDK: 11 
-    - Kotlin: 1.6.21 (Minimum)
-    - Library Dependencies:
-      - com.android.billingclient:billing:5.1.0
+|             | Minimum  | Maximum |
+|-------------|----------|---------|
+| Android SDK | 23       | 32      |
+| Java/JDK    | 11       |         |
+| Kotlin      | 1.8.0    |         | 
+
+- Library Dependencies:
+    - com.android.billingclient:billing:5.1.0
 
 

google-play-billing/build.gradle.kts

@@ -7,7 +7,7 @@ apply {
 }
 // Version of the Module. It will be used for creating file
 // file name = "{project.name}.{project.version}.{build_type/variant}.aar"
-version = "1.0.0"
+version = "1.0.1"
 
 // all the build outputs under one location
 setBuildDir("${rootProject.buildDir}/${project.name}")
@@ -17,15 +17,16 @@ extra.apply {
     set("moduleName", "GooglePlayBilling")
     set("binary_type", "local")
     set("remoteDependencies", "\"com.android.billingclient:billing:5.1.0\"")
-
 }
 
 android {
+    namespace="gaml.google.play.billing"
     compileSdk = 32
 
+
     defaultConfig {
         minSdk = 23
-        targetSdk = 32
+        //targetSdk = 32
     }
 
     buildTypes {
@@ -48,7 +49,7 @@ apply<GdapPlugin>()
 dependencies {
     compileOnly(fileTree(mapOf("dir" to "$rootDir/libs/", "include" to listOf("godot-lib*.aar"))))
     implementation("androidx.core:core-ktx:1.9.0")
-    implementation("androidx.appcompat:appcompat:1.5.1")
+    implementation("androidx.appcompat:appcompat:1.6.0")
     implementation("com.android.billingclient:billing:5.1.0")
     implementation("com.android.billingclient:billing-ktx:5.1.0")
 }

google-play-billing/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-package="gaml.google.play.billing">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 <application>
     <meta-data
         android:name="org.godotengine.plugin.v1.GooglePlayBilling"

google-play-billing/src/main/kotlin/gaml/google/play/billing/GooglePlayBillingPlugin.kt

@@ -247,10 +247,9 @@ class GooglePlayBillingPlugin(godot:Godot): GodotPlugin(godot),BillingClientStat
 
                 // add to the list for sending back
                 val dict = BillingUtils.getProductDetailsDictionary(productDetail)
-                for (entry in dict.entries){
-                    Log.i(TAG, "...${entry.key} = ${entry.value}")
-                }
-                Log.i(TAG,"")
+//                for (entry in dict.entries){
+//                    Log.i(TAG, "...${entry.key} = ${entry.value}")
+//                }
                 productList.add(dict)
             }
 

google-play-game-services/README.md

@@ -28,7 +28,7 @@ The features supported areas follows:
 
 
 ### Additional Configuration:
-For the plugin to work follwing changes has to be done
+For the plugin to work following changes has to be done
 1. Setup the Game project and add proper credentials for the project. Follow the steps mentioned [here](https://developers.google.com/games/services/console/enabling)
 2. In your app's `AndroidManifest.xml` file, add the following `<meta-data>` element and attributes to the `<application>` element:
 
@@ -57,7 +57,7 @@ For the plugin to work follwing changes has to be done
 #### Objects:
 
 - ##### Player:
-  Reprsents the player as represented by the game service
+  Represents the player as represented by the game service
   - **player_id [String]** - Id of the player
   - **title [String]** - Title of the player
   - **display_name [String]** - Name as displayed for the player.
@@ -68,7 +68,7 @@ For the plugin to work follwing changes has to be done
   Checks if the user signed in into the game services or not.
 
   **Returns:**
-  - **[Boolean]** true if signedin else false
+  - **[Boolean]** true if signed in else false
 
 
 - ##### signIn()
@@ -84,19 +84,28 @@ For the plugin to work follwing changes has to be done
 #### Signals
 
 - ##### sign_in_success()
-  Raised when the signin is successful. If the game is integrated successfully, then this signal will be raised automatically on the launch of the game.
+  Raised when the signed in is successful. If the game is integrated successfully, then this signal will be raised automatically on the launch of the game.
 
 
 - ##### sign_in_failed()
-  Raised when the signin is not successful. If the game is integrated successfully, then this signal will be raised automatically on the launch of the game.
+  Raised when the signed in is not successful. If the game is integrated successfully, then this signal will be raised automatically on the launch of the game.
 
 - ##### player_info_fetched (player_info)
   Raised when the player info is fetched from the services.
 
   **Parameters**
   - **player_info [Player]** The player data if the fetch has been successful else empty dictionary
 
+### Developer Notes:
 
+|             | Minimum  | Maximum |
+|-------------|----------|---------|
+| Android SDK | 23       | 32      |
+| Java/JDK    | 11       |         |
+| Kotlin      | 1.8.0    |         | 
+
+- Library Dependencies:
+  - com.google.android.gms:play-services-games-v2:17.0.0
 
 
 

google-play-game-services/build.gradle.kts

@@ -7,7 +7,7 @@ apply {
 }
 // Version of the Module. It will be used for creating file
 // file name = "{project.name}.{project.version}.{build_type/variant}.aar"
-version = "1.0.0"
+version = "1.0.1"
 
 // all the build outputs under one location
 setBuildDir("${rootProject.buildDir}/${project.name}")
@@ -21,11 +21,12 @@ extra.apply {
 }
 
 android {
+    namespace = "gaml.google.play.game.services"
     compileSdk = 32
 
     defaultConfig {
         minSdk = 23
-        targetSdk = 32
+        //targetSdk = 32
     }
 
     buildTypes {

google-play-game-services/src/main/AndroidManifest.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-package="gaml.google.play.game.services">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 <application>
     <meta-data
         android:name="org.godotengine.plugin.v1.GooglePlayGameServices"

google-play-review/README.md

@@ -67,40 +67,33 @@ if Engine.has_singleton("GooglePlayReview"):
 
 ### APIs
 
-**Methods**
+#### Methods
 
-- **launchInAppReview()**
-  Launches the in-app review flow
-
-  **Parameters**
-  - None
-
-  **Returns:**
-  - None
+- ##### launchInAppReview()
+  Launches the in-app review flow within the app.
 
- - **launchInStoreReview()**
-    Launches the google play app and opens the app for providing review.
-
-    **Parameters**
-    - None
-
-    **Returns:**
-    - None
 
+- ##### launchInStoreReview()
+   Launches the google play store app and opens the app for providing review.
+
+
 
 **Signals**
-  - **flow_completed** 
+  - ##### flow_completed
     Raised when the review flow is completed. It is called only for InApp Review flow.
-  - **flow_launch_error**
-    Raised when the review flow launch failed. It is called only for InApp Review flow. This will not be raised if the review launch was successful but window did not show.
 
+  - ##### flow_launch_error
+    Raised when the review flow launch failed. It is called only for InApp Review flow. This will not be raised if the review launch was successful but window did not show.
 
 
 ### Developer Notes:
 
-    - Android SDK:  Minimum - 23, Target - 32
-    - Java/JDK: 11 
-    - Kotlin: 1.6.21 (Minimum)
-    - Libraries dependencies:
-      - com.google.android.play:review:2.0.1
+|             | Minimum  | Maximum |
+|-------------|----------|---------|
+| Android SDK | 23       | 32      |
+| Java/JDK    | 11       |         |
+| Kotlin      | 1.8.0    |         | 
+
+- Library Dependencies:
+    - com.google.android.play:review:2.0.1