Skip to content

Commit e25e513

Browse files
committed
updated libraries so 16K aligment is now good,
missing fix for verifone inverted issue
1 parent 2227375 commit e25e513

File tree

5 files changed

+28
-18
lines changed

5 files changed

+28
-18
lines changed

build.gradle.kts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ plugins {
44
alias(libs.plugins.kotlinAndroid) apply false
55
alias(libs.plugins.androidLibrary) apply false
66
alias(libs.plugins.detekt) apply false
7+
alias(libs.plugins.compose.compiler) apply false
78
}

gradle/libs.versions.toml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[versions]
22
# Define the dependency versions
3-
agp = "8.4.2"
4-
kotlin = "1.9.22"
3+
kotlin = "2.2.0"
4+
agp = "8.11.1"
55
kotlinCoroutines = "1.7.3"
66
core = "1.13.1"
77
appcompat = "1.6.1"
@@ -10,10 +10,10 @@ fragment = "1.6.2"
1010
lifecycle = "2.7.0"
1111
material = "1.11.0"
1212
material3 = "1.2.0"
13-
mlKit = "17.2.0"
14-
playServicesMlkit = "18.3.0"
15-
cameraX = "1.3.1"
16-
cameraView = "1.3.1"
13+
mlKit = "17.3.0"
14+
playServicesMlkit = "18.3.1"
15+
cameraX = "1.5.0"
16+
cameraView = "1.5.0"
1717

1818
activity-compose = "1.9.0"
1919
compose-bom = "2024.06.00"
@@ -98,6 +98,7 @@ androidApplication = { id = "com.android.application", version.ref = "agp" }
9898
kotlinAndroid = { id = "org.jetbrains.kotlin.android", version.ref = "kotlin" }
9999
androidLibrary = { id = "com.android.library", version.ref = "agp" }
100100
detekt = { id = "io.gitlab.arturbosch.detekt", version.ref = "detekt" }
101+
compose-compiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" }
101102

102103
[bundles]
103104
core = [
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Fri Feb 11 09:37:55 CET 2022
22
distributionBase=GRADLE_USER_HOME
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
44
distributionPath=wrapper/dists
55
zipStorePath=wrapper/dists
66
zipStoreBase=GRADLE_USER_HOME

sample/build.gradle.kts

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,22 @@
1+
import org.gradle.kotlin.dsl.withType
2+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
15
plugins {
26
alias(libs.plugins.androidApplication)
37
alias(libs.plugins.kotlinAndroid)
8+
alias(libs.plugins.compose.compiler)
49
}
510

611
android {
712
namespace = "de.tillhub.scanengine.sample"
813

9-
compileSdk = 34
14+
compileSdk = 35
1015

1116
defaultConfig {
1217
applicationId = "de.tillhub.scanengine.sample"
1318
minSdk = 24
14-
targetSdk = 34
19+
targetSdk = 35
1520

1621
vectorDrawables {
1722
useSupportLibrary = true
@@ -26,9 +31,9 @@ android {
2631
useJUnitPlatform()
2732
}
2833

29-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
30-
kotlinOptions {
31-
jvmTarget = JavaVersion.VERSION_17.toString()
34+
kotlin {
35+
compilerOptions {
36+
jvmTarget.set(JvmTarget.JVM_17)
3237
}
3338
}
3439
buildFeatures {

scan-engine/build.gradle.kts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
2+
13
plugins {
24
alias(libs.plugins.androidLibrary)
35
alias(libs.plugins.kotlinAndroid)
46
alias(libs.plugins.detekt)
7+
alias(libs.plugins.compose.compiler)
58
id("maven-publish")
69
}
710

811
android {
912
namespace = "de.tillhub.scanengine"
10-
compileSdk = 34
13+
compileSdk = 35
1114

1215
defaultConfig {
1316
minSdk = 24
@@ -41,10 +44,10 @@ android {
4144
useJUnitPlatform()
4245
}
4346

44-
tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
45-
kotlinOptions {
46-
jvmTarget = JavaVersion.VERSION_17.toString()
47-
freeCompilerArgs = listOf("-Xjvm-default=all")
47+
kotlin {
48+
compilerOptions {
49+
jvmTarget.set(JvmTarget.JVM_17)
50+
freeCompilerArgs.add("-Xjvm-default=all")
4851
}
4952
}
5053
buildFeatures {
@@ -103,7 +106,7 @@ afterEvaluate {
103106
create<MavenPublication>("scan-engine") {
104107
groupId = "de.tillhub.scanengine"
105108
artifactId = "scan-engine"
106-
version = "1.5.7"
109+
version = "1.6.2"
107110

108111
from(components.getByName("release"))
109112
}

0 commit comments

Comments
 (0)