Skip to content

File tree

6 files changed

+20
-18
lines changed

6 files changed

+20
-18
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ buildscript {
22
ext {
33
compose_version = '1.2.0-beta03'
44
}
5-
ext.kotlin_version = '1.6.21'
5+
ext.kotlin_version = '1.7.10'
66

77
repositories {
88
google()

kotlin-compose-sample/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ android {
4141
}
4242

4343
composeOptions {
44-
kotlinCompilerExtensionVersion compose_version
44+
kotlinCompilerExtensionVersion '1.3.0'
4545
}
4646

4747
packagingOptions {
@@ -73,4 +73,4 @@ dependencies {
7373

7474
debugImplementation "androidx.compose.ui:ui-tooling:$compose_version"
7575
debugImplementation "androidx.compose.ui:ui-test-manifest:$compose_version"
76-
}
76+
}

kotlin-customization-sample/build.gradle

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

66
android {
7-
compileSdkVersion 31
7+
compileSdkVersion 33
88

99
defaultConfig {
1010
applicationId 'io.snabble.sdk.customization'
1111
minSdkVersion 21
12-
targetSdkVersion 31
12+
targetSdkVersion 33
1313
versionCode 1
1414
versionName '1.0'
1515

@@ -58,4 +58,4 @@ dependencies {
5858
testImplementation 'junit:junit:4.13.2'
5959
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
6060
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
61-
}
61+
}

kotlin-sample/build.gradle

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ android {
3131
}
3232

3333
dependencies {
34+
def nav_version = '2.5.2'
3435
implementation 'androidx.preference:preference-ktx:1.2.0'
3536
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${project.desugarVersion}"
3637

@@ -44,17 +45,15 @@ dependencies {
4445
// implementation 'io.snabble.sdk:ui:{currentVersion}'
4546

4647
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
47-
implementation 'androidx.core:core-ktx:1.8.0'
48-
implementation 'androidx.appcompat:appcompat:1.4.1'
48+
implementation 'androidx.core:core-ktx:1.9.0'
49+
implementation 'androidx.appcompat:appcompat:1.5.1'
4950
implementation 'com.google.android.material:material:1.6.1'
5051
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
51-
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
52-
implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
52+
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
53+
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
5354
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
54-
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
55-
implementation 'androidx.navigation:navigation-ui-ktx:2.5.1'
5655

5756
testImplementation 'junit:junit:4.13.2'
5857
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
5958
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
60-
}
59+
}

ui-toolkit/build.gradle

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,8 @@ android {
5050
}
5151

5252
dependencies {
53+
def nav_version = "2.5.2"
54+
5355
implementation 'androidx.gridlayout:gridlayout:1.0.0'
5456
implementation 'com.google.android.gms:play-services-maps:18.1.0'
5557
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:${project.desugarVersion}"
@@ -58,10 +60,10 @@ dependencies {
5860
implementation project(':utils')
5961
implementation project(':ui')
6062

61-
implementation 'androidx.core:core-ktx:1.8.0'
62-
implementation 'androidx.appcompat:appcompat:1.4.1'
63-
implementation 'androidx.navigation:navigation-runtime-ktx:2.5.1'
64-
implementation 'androidx.navigation:navigation-fragment-ktx:2.5.1'
63+
implementation 'androidx.core:core-ktx:1.9.0'
64+
implementation 'androidx.appcompat:appcompat:1.5.1'
65+
implementation "androidx.navigation:navigation-runtime-ktx:$nav_version"
66+
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
6567

6668
implementation 'com.google.android.material:material:1.6.1'
6769
api 'androidx.preference:preference-ktx:1.2.0'

ui/src/main/java/io/snabble/sdk/ui/checkout/PaymentStatusView.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -244,6 +244,7 @@ class PaymentStatusView @JvmOverloads constructor(
244244
checkout.abort()
245245
}
246246
}
247+
else -> Unit
247248
}
248249

249250
statusContainer.layoutTransition.enableTransitionType(LayoutTransition.CHANGING)
@@ -433,4 +434,4 @@ class PaymentStatusView @JvmOverloads constructor(
433434
this.paymentOriginCandidate = paymentOriginCandidate
434435
}
435436
}
436-
}
437+
}

0 commit comments

Comments
 (0)