Skip to content

Commit

Permalink
Merge pull request #92 from cb-haripriyan/upgrade-to-bl5-version
Browse files Browse the repository at this point in the history
Upgrade Billing Library to version 5.2.1
  • Loading branch information
cb-haripriyan authored Nov 9, 2023
2 parents 7a1901b + c5f2a5e commit 0e325ef
Show file tree
Hide file tree
Showing 7 changed files with 16 additions and 16 deletions.
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ Post-installation, initialization, and authentication with the Chargebee site, t
## Requirements
The following requirements must be set up before installing Chargebee’s Android SDK.

* Android 5.0 (API level 21) and above
* [Android Gradle Plugin](https://developer.android.com/studio/releases/gradle-plugin) 4.0.0
* Android Target API Level 31 and above
* [Android Gradle Plugin](https://developer.android.com/studio/releases/gradle-plugin) 4.2.2
* [Gradle](https://gradle.org/releases/) 6.1.1+
* [AndroidX](https://developer.android.com/jetpack/androidx/)
* Java 8+ and Kotlin
Expand All @@ -21,7 +21,7 @@ The following requirements must be set up before installing Chargebee’s Androi
The `Chargebee-Android` SDK can be installed by adding below dependency to the `build.gradle` file:

```kotlin
implementation 'com.chargebee:chargebee-android:1.0.25'
implementation 'com.chargebee:chargebee-android:1.2.0'
```

## Example project
Expand Down
1 change: 0 additions & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
apply plugin: 'com.android.application'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
apply plugin: 'kotlin-kapt'

android {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class SubscriptionActivity : BaseActivity() {
Log.i(javaClass.simpleName, "Subscriptions by using queryParams: $it")
if(it?.size!! >0) {
val subscriptionStatus =
it?.get(0).cb_subscription.status + "\nPlan Price : " + it?.get(0)?.cb_subscription?.plan_amount;
it?.get(0)?.cb_subscription?.status + "\nPlan Price : " + it?.get(0)?.cb_subscription?.plan_amount;
alertSuccess(subscriptionStatus)
}else{
alertSuccess("Subscriptions not found in Chargebee System")
Expand Down
4 changes: 2 additions & 2 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = "1.3.72"
ext.kotlin_version = "1.8.20"
ext.assertj_version = '3.16.1'
repositories {
google()
jcenter()
}
dependencies {
classpath "com.android.tools.build:gradle:4.0.0"
classpath "com.android.tools.build:gradle:4.2.2"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"

// NOTE: Do not place your application dependencies here; they belong
Expand Down
15 changes: 8 additions & 7 deletions chargebee/build.gradle
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion 30
compileSdkVersion 31

defaultConfig {
minSdkVersion 21
targetSdkVersion 30
targetSdkVersion 31
versionCode 1
versionName "1.1.0"
versionName "1.2.0"

testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
Expand Down Expand Up @@ -39,10 +38,10 @@ dependencies {
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.7"
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'

// Google play billing library
implementation 'com.android.billingclient:billing-ktx:4.0.0'
implementation 'com.android.billingclient:billing-ktx:5.2.1'

// AssertJ
testImplementation "org.assertj:assertj-core:$assertj_version"
Expand All @@ -53,7 +52,9 @@ dependencies {
// Mockito
testImplementation 'org.mockito:mockito-core:2.23.0'

testImplementation 'androidx.test:core:1.2.0'
testImplementation 'androidx.test:core:1.4.0'

testImplementation 'org.json:json:20140107'

testImplementation 'androidx.test.ext:junit:1.1.1'
}
Expand Down
2 changes: 1 addition & 1 deletion chargebee/src/main/java/com/chargebee/android/Chargebee.kt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ object Chargebee {
var appName: String = "Chargebee"
var environment: String = "cb_android_sdk"
const val platform: String = "Android"
const val sdkVersion: String = BuildConfig.VERSION_NAME
const val sdkVersion: String = "1.2.0"
const val limit: String = "100"
private const val PLAY_STORE_SUBSCRIPTION_URL =
"https://play.google.com/store/account/subscriptions"
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

0 comments on commit 0e325ef

Please sign in to comment.