Skip to content

Commit eb7fe38

Browse files
committed
feat: update android project
1 parent 1a8294a commit eb7fe38

12 files changed

Lines changed: 39 additions & 39 deletions

File tree

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
poolakeyunitysdk-unity/.utmp
2+
poolakeyunitysdk-android/.idea
3+
poolakeyunitysdk-android/poolakey/.idea

poolakeyunitysdk-android/app/build.gradle

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,34 +4,37 @@ plugins {
44
}
55

66
android {
7-
compileSdkVersion 32
8-
7+
compileSdkVersion 34
8+
namespace "com.sample.android.trivialdrivesample"
99
defaultConfig {
1010
applicationId "com.sample.android.trivialdrivesample"
1111
minSdkVersion 21
12-
targetSdkVersion 32
12+
//noinspection EditedTargetSdkVersion
13+
targetSdkVersion 34
1314
versionCode 1
1415
versionName "1.0"
15-
1616
}
1717

1818
buildTypes {
1919
release {
2020
minifyEnabled false
2121
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
2222
}
23+
debug {
24+
android.buildFeatures.buildConfig true
25+
}
2326
}
2427
compileOptions {
25-
sourceCompatibility JavaVersion.VERSION_1_8
26-
targetCompatibility JavaVersion.VERSION_1_8
28+
sourceCompatibility JavaVersion.VERSION_22
29+
targetCompatibility JavaVersion.VERSION_22
2730
}
2831
}
2932

3033
dependencies {
3134

32-
implementation 'androidx.appcompat:appcompat:1.4.1'
33-
implementation 'com.google.android.material:material:1.5.0'
34-
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
35+
implementation 'androidx.appcompat:appcompat:1.7.0'
36+
implementation 'com.google.android.material:material:1.12.0'
37+
implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
3538
implementation "com.github.cafebazaar.Poolakey:poolakey:$library.poolakey_version"
3639
implementation project(path: ':poolakey')
3740
}

poolakeyunitysdk-android/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ buildscript {
66
mavenCentral()
77
}
88
dependencies {
9-
classpath "com.android.tools.build:gradle:3.4.3"
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.20"
9+
classpath "com.android.tools.build:gradle:8.7.2"
10+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.10"
1111
// NOTE: Do not place your application dependencies here; they belong
1212
// in the individual module build.gradle files
1313
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Thu Jan 27 09:58:54 IRST 2022
1+
#Sat Nov 23 22:28:23 GMT+03:30 2024
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
4+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
45
zipStoreBase=GRADLE_USER_HOME
56
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

poolakeyunitysdk-android/poolakey/build.gradle

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,22 @@
11
apply plugin: 'com.android.library'
22
apply plugin: 'kotlin-android'
33
ext {
4-
kotlin_version = '1.4.20'
4+
kotlin_version = '1.9.10'
55
}
66
android {
7-
compileSdkVersion 32
7+
namespace 'com.farsitel.bazaar'
8+
compileSdkVersion 34
89

910
defaultConfig {
10-
minSdkVersion 9
11+
minSdkVersion 21
1112
versionCode 200100
1213
versionName "2.1.0"
1314
}
1415

1516
buildTypes {
1617
debug {
1718
buildConfigField "String", 'POOLAKEY_VERSION', "\"{$library.poolakey_version}\""
19+
android.buildFeatures.buildConfig true
1820
}
1921
release {
2022
buildConfigField "String", 'POOLAKEY_VERSION', "\"{$library.poolakey_version}\""
@@ -26,8 +28,11 @@ android {
2628
}
2729

2830
compileOptions {
29-
sourceCompatibility JavaVersion.VERSION_1_8
30-
targetCompatibility JavaVersion.VERSION_1_8
31+
sourceCompatibility JavaVersion.VERSION_19
32+
targetCompatibility JavaVersion.VERSION_19
33+
}
34+
kotlinOptions {
35+
jvmTarget = '19' // or '1.8' for compatibility
3136
}
3237
}
3338

@@ -45,13 +50,14 @@ task createJar(type: Copy) {
4550
include('classes.jar')
4651
rename('classes.jar', 'Poolakey.jar')
4752
}*/
48-
task updateAAR(type: Copy) {
53+
tasks.register('updateAAR', Copy) {
4954
from('build/outputs/aar')
5055
into('../../poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Plugins/')
5156
include(project.name + '-release.aar')
57+
dependsOn 'bundleReleaseAar'
5258
}
5359

54-
project.tasks.whenTaskAdded { Task theTask ->
60+
project.tasks.configureEach { Task theTask ->
5561
if (theTask.name == 'assembleRelease') {
5662
theTask.dependsOn(updateAAR) // Compile the custom task after compiling apk
5763
}

poolakeyunitysdk-unity/Assets/Bazaar/Poolakey/Demo/ScriptableObjects/PoolakiData.asset

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,9 @@ MonoBehaviour:
1212
m_Script: {fileID: 11500000, guid: ef7d8b89e2c2b2346a1323f271922f6a, type: 3}
1313
m_Name: PoolakiData
1414
m_EditorClassIdentifier:
15-
<RsaKey>k__BackingField: MIHNMA0GCSqGSIb3DQEBAQUAA4G7ADCBtwKBrwCc/8ka6hgzFJ9C6tyVRC1EyjF0W68803l6KvmKXUZp/nXwd3+qTc1hC41y94n+NiwqzQ/L7Nle2eEPdyQoz1o+LmqQDHeBd8dp6G5yr2K61NmL6YFIhsBYIKCYDudZSU0hGMVKxEL/0fPie4TZlkoQ7Nsdiz4WLypotk0rEJYTc8F87g+kDwPsmBS8DF/uCRnKfDGQ87aDQPUkKzNHGL6ow/doLtAZP8YK4EDK+d8CAwEAAQ==
15+
<RsaKey>k__BackingField: -ENTER YOU RSA KEY HERE-
1616
<Items>k__BackingField:
17-
- <ItemName>k__BackingField: "\u0645\u062D\u0635\u0648\u0644 \u062A\u0633\u062A\u06CC
18-
\u06CC\u06A9"
19-
<ItemSKU>k__BackingField: test-product-1
20-
<ItemPrice>k__BackingField: 1
21-
<ItemType>k__BackingField: 0
22-
- <ItemName>k__BackingField: "\t \u0627\u0634\u062A\u0631\u0627\u06A9 \u062A\u0633\u062A\u06CC
23-
1"
24-
<ItemSKU>k__BackingField: test-subscription-1
25-
<ItemPrice>k__BackingField: 1
26-
<ItemType>k__BackingField: 1
27-
- <ItemName>k__BackingField: "\u0645\u062D\u0635\u0648\u0644 \u062A\u0633\u062A\u06CC
28-
2"
29-
<ItemSKU>k__BackingField: test-product-2
30-
<ItemPrice>k__BackingField: 1
17+
- <ItemName>k__BackingField: -ENTER YOUR ITEM NAME-
18+
<ItemSKU>k__BackingField: -ENTER YOUR ITEM SKU-
19+
<ItemPrice>k__BackingField: 0
3120
<ItemType>k__BackingField: 0
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)