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

Updates and changes for 3.2.4 #21

Draft
wants to merge 3 commits into
base: master
Choose a base branch
from
Draft
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
7 changes: 5 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,10 @@ dist: trusty
android:
components:
- build-tools-29.0.3
- android-29
- android-30

before_install:
- yes | sdkmanager "platforms;android-30"

before_cache:
- rm -f $HOME/.gradle/caches/modules-2/modules-2.lock
Expand All @@ -16,5 +19,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/3.2.4/beta5/godot-lib.3.2.4.beta5.release.aar
- ./gradlew build -s
4 changes: 2 additions & 2 deletions 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.0.1.release.aar"
binary="GodotGooglePlayBilling.1.0.2.release.aar"

[dependencies]
remote=["com.android.billingclient:billing:3.0.0"]
remote=["com.android.billingclient:billing:3.0.2"]
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:4.0.0"
classpath "com.android.tools.build:gradle:4.0.2"

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
12 changes: 6 additions & 6 deletions godot-google-play-billing/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,16 @@ plugins {
id 'com.android.library'
}

ext.pluginVersionCode = 2
ext.pluginVersionName = "1.0.1"
ext.pluginVersionCode = 3
ext.pluginVersionName = "1.0.2"

android {
compileSdkVersion 29
buildToolsVersion "29.0.3"
compileSdkVersion 30
buildToolsVersion "30.0.3"

defaultConfig {
minSdkVersion 18
targetSdkVersion 29
targetSdkVersion 30
timoschwarzer marked this conversation as resolved.
Show resolved Hide resolved
versionCode pluginVersionCode
versionName pluginVersionName
}
Expand All @@ -25,6 +25,6 @@ android {

dependencies {
implementation "androidx.legacy:legacy-support-v4:1.0.0"
implementation 'com.android.billingclient:billing:3.0.0'
implementation 'com.android.billingclient:billing:3.0.2'
compileOnly fileTree(dir: 'libs', include: ['godot-lib*.aar'])
}