Merge branch 'release/3.1.0'

mvojtkovszky · Oct 18, 2024 · 31521dd · 31521dd
2 parents c3a92bc + c57d910
commit 31521dd
Show file tree

Hide file tree

Showing 10 changed files with 253 additions and 158 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # CHANGELOG
 
+## 3.1.0 (2024-10-18)
+* bump Google Billing to 7.1.1
+* bump kotlin to 2.0.20, Gradle plugin to 8.7.1
+
 ## 3.0.0 (2024-06-07)
 * add `´billingBuilderConfig` to `BillingHelper` constructor holding all parameters related to alternative billing and pending purchases support
 * move `enableAlternativeBillingOnly` and `enableExternalOffer` to `BillingBuilderConfig`

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # BillingHelper
-Simplify the use of Google Play Billing Library (v6.2.0). 
+Simplify the use of Google Play Billing Library (v7.0.0). 
 Handles client connection, querying product details, owned purchases, different purchase types, 
 acknowledging purchases, verify purchase signatures etc.
 

diff --git a/billinghelper/build.gradle b/billinghelper/build.gradle
@@ -43,12 +43,12 @@ dependencies {
     https://developer.android.com/google/play/billing/billing_library_overview
     https://developer.android.com/google/play/billing/release-notes
      */
-    api 'com.android.billingclient:billing-ktx:7.0.0'
+    api 'com.android.billingclient:billing-ktx:7.1.1'
 
     /* https://developer.android.com/jetpack/androidx/releases/test */
     testImplementation 'junit:junit:4.13.2'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
+    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 }
 
 apply from: "$rootDir/gradle-mvn-push.gradle"
diff --git a/billinghelper/gradle.properties b/billinghelper/gradle.properties
@@ -3,4 +3,4 @@ buildTypes=debug,release
 groupId=com.github.mvojtkovszky
 artifactId=BillingHelper
 moduleId=billinghelper
-versionName=3.0.0
+versionName=3.1.0
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,6 @@
 buildscript {
     ext {
-        kotlin_version = "1.9.23" /* https://github.com/JetBrains/kotlin */
+        kotlin_version = "2.0.20" /* https://github.com/JetBrains/kotlin */
         dokka_version = '1.9.20' /* https://github.com/Kotlin/dokka/releases */
     }
 
@@ -10,7 +10,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.3.2'
+        classpath 'com.android.tools.build:gradle:8.7.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.dokka:dokka-gradle-plugin:$dokka_version"
     }

diff --git a/gradle.properties b/gradle.properties
@@ -21,8 +21,8 @@ android.enableJetifier=true
 kotlin.code.style=official
 
 # base versions
-buildToolsVersion=34.0.0
-compileSdkVersion=34
+buildToolsVersion=35.0.0
+compileSdkVersion=35
 minSdkVersion=21
-targetSdkVersion=34
+targetSdkVersion=35
 javaVersion=17
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,7 @@
-#Fri Apr 05 14:06:29 CEST 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists