Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed errors for compiling with Java17, gradle 8.1 and godot 4.2.2 #64

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ cache:
- $HOME/.gradle/wrapper/

script:
- wget -P ./godot-google-play-billing/libs https://downloads.tuxfamily.org/godotengine/3.2.2/rc2/godot-lib.3.2.2.rc2.release.aar
- wget -P ./godot-google-play-billing/libs https://downloads.tuxfamily.org/godotengine/4.2.2/godot-lib.4.2.2.stable.template_release.aar
- ./gradlew build -s
2 changes: 1 addition & 1 deletion GodotGooglePlayBilling.gdap
Original file line number Diff line number Diff line change
Expand Up @@ -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:5.2.1"]
10 changes: 3 additions & 7 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,21 +1,17 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
repositories {
google()
jcenter()
mavenCentral()
}
dependencies {
classpath "com.android.tools.build:gradle:4.0.0"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath "com.android.tools.build:gradle:8.1.0"
}
}

allprojects {
repositories {
google()
jcenter()
mavenCentral()
}
}

Expand Down
12 changes: 7 additions & 5 deletions godot-google-play-billing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ plugins {
}

ext.pluginVersionCode = 5
ext.pluginVersionName = "1.2.0"
ext.pluginVersionName = "1.3.0"

android {
compileSdkVersion 31
buildToolsVersion "30.0.3"
compileSdk 33

defaultConfig {
minSdkVersion 18
targetSdkVersion 31
minSdk 21
targetSdk 33
versionCode pluginVersionCode
versionName pluginVersionName
}
Expand All @@ -21,10 +20,13 @@ android {
output.outputFileName = "GodotGooglePlayBilling.$pluginVersionName.${variant.name}.aar"
}
}

namespace 'org.godotengine.godot.plugin.googleplaybilling'
}

dependencies {
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation group: 'org.godotengine', name: 'godot', version: '4.2.2.stable'
implementation 'com.android.billingclient:billing:5.2.1'
compileOnly fileTree(dir: 'libs', include: ['godot-lib*.aar'])
}
3 changes: 1 addition & 2 deletions godot-google-play-billing/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +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>

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ org.gradle.jvmargs=-Xmx2048m
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app"s APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -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.1-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
Loading