diff options
Diffstat (limited to 'merchant-lib')
| -rw-r--r-- | merchant-lib/build.gradle | 17 | ||||
| -rw-r--r-- | merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt | 2 |
2 files changed, 9 insertions, 10 deletions
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle index 50c2aa5..5d4bc48 100644 --- a/merchant-lib/build.gradle +++ b/merchant-lib/build.gradle @@ -21,13 +21,11 @@ plugins { } android { - compileSdkVersion 32 - //noinspection GradleDependency - buildToolsVersion "$build_tools_version" + namespace 'net.taler.merchantlib' + compileSdk 34 defaultConfig { minSdkVersion 21 - targetSdkVersion 32 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" @@ -43,12 +41,13 @@ android { proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } - compileOptions { - sourceCompatibility = 1.8 - targetCompatibility = 1.8 + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" } - namespace 'net.taler.merchantlib' } dependencies { @@ -63,7 +62,7 @@ dependencies { testImplementation "junit:junit:$junit_version" testImplementation "io.ktor:ktor-client-mock-jvm:$ktor_version" - testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.4' + testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.7.3' } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).configureEach { diff --git a/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt b/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt index 9d6defd..cf627c6 100644 --- a/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt +++ b/merchant-lib/src/test/java/net/taler/merchantlib/MerchantApiTest.kt @@ -80,7 +80,7 @@ class MerchantApiTest { { "product_id": "${product.productId}", "description": "${product.description}", - "price": "${product.price.toJSONString()}", + "price": "${product.price!!.toJSONString()}", "quantity": ${product.quantity} } ] |