Skip to content

Commit 3eba33f

Browse files
authored
Merge pull request #22 from PAYONE-GmbH/feature/kotlin-2.3.0
Feature/kotlin 2.3.0
2 parents e2acc6f + d793e96 commit 3eba33f

9 files changed

Lines changed: 702 additions & 6 deletions

File tree

.github/workflows/test.yml

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
name: Test Android Library
2+
3+
on:
4+
push:
5+
branches:
6+
- main # Trigger on push to the main branch
7+
pull_request:
8+
branches: ['main', 'develop']
9+
workflow_dispatch: # Allows manual triggering from the Actions tab
10+
11+
jobs:
12+
publish:
13+
runs-on: ubuntu-24.04
14+
15+
steps:
16+
- name: Checkout code
17+
uses: actions/checkout@v3
18+
19+
- name: Make gradlew executable
20+
run: chmod +x ./gradlew
21+
22+
- name: Set up JDK 17
23+
uses: actions/setup-java@v3
24+
with:
25+
java-version: '17'
26+
distribution: 'zulu'
27+
28+
- name: Cache Gradle dependencies
29+
uses: actions/cache@v3
30+
with:
31+
path: ~/.gradle/caches
32+
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
33+
restore-keys: |
34+
${{ runner.os }}-gradle
35+
36+
- name: Build Android library
37+
run: ./run_test.sh

app/build.gradle.kts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,10 @@ android {
3535
sourceCompatibility = JavaVersion.VERSION_1_8
3636
targetCompatibility = JavaVersion.VERSION_1_8
3737
}
38-
kotlinOptions {
39-
jvmTarget = "1.8"
38+
kotlin {
39+
compilerOptions {
40+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
41+
}
4042
}
4143
buildFeatures {
4244
compose = true

gradle/libs.versions.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[versions]
22
agp = "8.4.2"
3-
kotlin = "2.2.0"
3+
kotlin = "2.3.0"
44
compose-plugin = "1.8.2"
55
coreKtx = "1.13.1"
66
junit = "4.13.2"

gradlew

100644100755
File mode changed.

pcp-client-android-sdk/build.gradle.kts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ plugins {
44
alias(libs.plugins.android.library)
55
alias(libs.plugins.jetbrains.kotlin.android)
66
alias(libs.plugins.sonar)
7-
kotlin("plugin.serialization") version "2.1.0"
7+
kotlin("plugin.serialization") version libs.versions.kotlin.get()
88
alias(libs.plugins.maven.publish)
99
}
1010

@@ -32,8 +32,10 @@ android {
3232
sourceCompatibility = JavaVersion.VERSION_1_8
3333
targetCompatibility = JavaVersion.VERSION_1_8
3434
}
35-
kotlinOptions {
36-
jvmTarget = "1.8"
35+
kotlin {
36+
compilerOptions {
37+
jvmTarget.set(org.jetbrains.kotlin.gradle.dsl.JvmTarget.JVM_1_8)
38+
}
3739
}
3840
}
3941

@@ -46,6 +48,8 @@ dependencies {
4648
implementation(libs.kotlinx.serialization)
4749
testImplementation(libs.junit)
4850
testImplementation(libs.mockito.core)
51+
testImplementation("org.robolectric:robolectric:4.11.1")
52+
testImplementation("androidx.test:core:1.5.0")
4953
androidTestImplementation(libs.mockito.android)
5054
androidTestImplementation(libs.androidx.junit)
5155
androidTestImplementation(libs.androidx.runner)

0 commit comments

Comments
 (0)