Skip to content

Commit 4a6acd5

Browse files
committed
fixed build
1 parent e7ccd49 commit 4a6acd5

File tree

11 files changed

+29
-20
lines changed

11 files changed

+29
-20
lines changed

build.gradle

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,21 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22
buildscript {
3-
ext.kotlin_version = '1.6.10'
3+
ext.kotlin_version = '1.7.10'
44
repositories {
55
google()
66
mavenCentral()
77
}
88
dependencies {
9-
classpath "com.android.tools.build:gradle:7.2.1"
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
9+
classpath "com.android.tools.build:gradle:7.3.1"
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.10"
1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
1313
}
1414
}
1515

1616
plugins{
17-
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
17+
id 'io.github.gradle-nexus.publish-plugin' version '1.1.0'
18+
id 'org.jetbrains.kotlin.android' version '1.7.10' apply false
1819
}
1920

2021
task clean(type: Delete) {

demo-app/build.gradle

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,19 @@ plugins {
22
id 'com.android.application'
33
id 'kotlin-android'
44
id 'kotlin-kapt'
5+
id 'org.jetbrains.kotlin.android'
56

67
}
78

89

910
android {
10-
compileSdk 31
11+
compileSdk 33
1112

1213

1314
defaultConfig {
1415
applicationId "co.thepeer"
1516
minSdk 21
16-
targetSdk 31
17+
targetSdk 33
1718
versionCode 1
1819
versionName "1.0"
1920

@@ -41,11 +42,13 @@ android {
4142

4243
dependencies {
4344

44-
implementation project(':thepeer-android')
45-
implementation 'androidx.core:core-ktx:1.7.0'
45+
implementation project(":thepeer-android")
46+
implementation 'androidx.core:core-ktx:1.9.0'
4647
implementation 'androidx.appcompat:appcompat:1.4.1'
4748
implementation 'com.google.android.material:material:1.5.0'
4849
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
50+
implementation 'androidx.core:core-ktx:+'
51+
implementation 'androidx.core:core-ktx:+'
4952
testImplementation 'junit:junit:4.+'
5053
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
5154
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

demo-app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121

2222
<meta-data
2323
android:name="co.thepeer.PublicKey"
24-
android:value="pspk_test_2aj8xasztf4domzd2nphinvzkvecpbuyxldkvr3pkuvko" />
24+
android:value="pspk_test_m7pbk9fbjaofi92shcgxq8is4pfgxl0t0bq3g3bmrp7iq" />
2525
</application>
2626

2727
</manifest>

demo-app/src/main/java/co/thepeer/MainActivity.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ class MainActivity : AppCompatActivity() {
2525
//initialize Thepeer SDK
2626
val thepeer = Thepeer.Builder(
2727
activity = this,
28-
amount = BigDecimal(10000000),
28+
amount = BigDecimal(10000),
2929
currency = ThepeerCurrency.NGN,
3030
userReference = getString(R.string.user_reference),
3131
resultListener = resultListener
3232
).setMeta(mapOf("city" to "Uyo")).build()
3333

3434
binding.btnSendMoney.setOnClickListener {
35-
//calling ThePeer SDK
35+
//calling Thepeer SDK
3636
thepeer.send()
3737
}
3838
binding.btnCheckout.setOnClickListener {

demo-app/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
<string name="send_money">Send Money</string>
44
<string name="checkout">Checkout</string>
55
<string name="direct_charge">Direct Charge</string>
6-
<string name="user_reference">73f03de5-1043-4ad1-bc2e-aa4d94ebee4f</string>
6+
<string name="user_reference">fd92e93b-8907-4429-86e5-9cf2fea2a9d8</string>
77
</resources>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Wed Feb 09 22:24:53 WAT 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

java-demo/build.gradle

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
plugins {
22
id 'com.android.application'
3+
id 'org.jetbrains.kotlin.android'
34
}
45

56
android {
@@ -28,10 +29,11 @@ android {
2829
}
2930

3031
dependencies {
31-
implementation project(':thepeer-android')
32+
implementation 'co.thepeer:thepeer-android:1.0.0-alpha05'
3233
implementation 'androidx.appcompat:appcompat:1.4.1'
3334
implementation 'com.google.android.material:material:1.5.0'
3435
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
36+
implementation 'androidx.core:core-ktx:+'
3537
testImplementation 'junit:junit:4.+'
3638
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
3739
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ dependencyResolutionManagement {
55
repositories {
66
google()
77
mavenCentral()
8-
jcenter() // Warning: this repository is going to shut down soon
8+
99
}
1010
}
1111
rootProject.name = "thepeer-android"

thepeer-android/build.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,18 @@ plugins {
44
id 'kotlin-parcelize'
55
id 'kotlin-kapt'
66
id 'maven-publish'
7+
id 'org.jetbrains.kotlin.android'
78
}
89

910

1011
version = "1.0.0"
1112

1213
android {
13-
compileSdk 31
14+
compileSdk 33
1415

1516
defaultConfig {
1617
minSdk 21
17-
targetSdk 31
18+
targetSdk 33
1819
versionCode 1
1920
versionName "1.0"
2021

@@ -46,7 +47,7 @@ android {
4647

4748
dependencies {
4849

49-
implementation 'androidx.core:core-ktx:1.8.0'
50+
implementation 'androidx.core:core-ktx:1.9.0'
5051
implementation 'androidx.appcompat:appcompat:1.4.2'
5152
implementation 'com.google.android.material:material:1.6.1'
5253
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
@@ -55,6 +56,8 @@ dependencies {
5556
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutineVersion"
5657
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
5758
implementation 'androidx.webkit:webkit:1.4.0'
59+
implementation 'androidx.core:core-ktx:+'
60+
implementation 'androidx.core:core-ktx:+'
5861

5962
// MockK kotlin mocking framework
6063
testImplementation "io.mockk:mockk:$mockkVersion"

thepeer-android/src/main/java/co/thepeer/sdk/utils/Logger.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package co.thepeer.sdk.utils
22

33
import android.util.Log
4-
import co.thepeer.sdk.BuildConfig
4+
import androidx.viewbinding.BuildConfig
55

66
internal object Logger {
77

0 commit comments

Comments
 (0)