[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-android] branch master updated: upgrade all the things!
|
From: |
gnunet |
|
Subject: |
[taler-taler-android] branch master updated: upgrade all the things! |
|
Date: |
Wed, 11 Oct 2023 17:07:12 +0200 |
This is an automated email from the git hooks/post-receive script.
torsten-grote pushed a commit to branch master
in repository taler-android.
The following commit(s) were added to refs/heads/master by this push:
new 5801fe2 upgrade all the things!
5801fe2 is described below
commit 5801fe2ea15a468c241d3552ff26af4fa20e0b58
Author: Torsten Grote <t@grobox.de>
AuthorDate: Wed Oct 11 11:21:59 2023 -0300
upgrade all the things!
---
.gitlab-ci.yml | 3 +++
.idea/gradle.xml | 2 +-
build.gradle | 14 ++++++-------
cashier/build.gradle | 13 ++++++------
cashier/proguard-rules.pro | 2 ++
.../net/taler/cashier/config/ConfigFragment.kt | 2 +-
.../java/net/taler/cashier/config/ConfigManager.kt | 4 ++--
gradle.properties | 1 +
gradle/wrapper/gradle-wrapper.properties | 2 +-
merchant-lib/build.gradle | 16 +++++++--------
merchant-terminal/build.gradle | 15 +++++++-------
merchant-terminal/proguard-rules.pro | 2 ++
taler-kotlin-android/build.gradle | 16 ++++++++++-----
wallet/build.gradle | 24 +++++++++++-----------
14 files changed, 63 insertions(+), 53 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 56c01a6..227859a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,8 @@
image: briar/ci-image-android:latest
+variables:
+ JAVA_HOME: /usr/lib/jvm/java-17-openjdk-amd64
+
cache:
paths:
- .gradle/wrapper
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index aa4060f..9b17a13 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
<option name="testRunner" value="GRADLE" />
<option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
- <option name="gradleJvm" value="Embedded JDK" />
+ <option name="gradleJvm" value="jbr-17" />
<option name="modules">
<set>
<option value="$PROJECT_DIR$" />
diff --git a/build.gradle b/build.gradle
index 1a43807..426ee87 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,14 +1,12 @@
buildscript {
ext {
- kotlin_version = '1.8.20' // observe compatibility with compose
compiler
- ktor_version = '2.3.0'
- nav_version = '2.5.3'
- material_version = '1.9.0'
- lifecycle_version = '2.6.1'
+ kotlin_version = '1.9.10' // observe compatibility with compose
compiler
+ ktor_version = '2.3.5'
+ nav_version = '2.7.4'
+ material_version = '1.10.0'
+ lifecycle_version = '2.6.2'
constraintlayout_version = '2.1.4'
junit_version = "4.13.2"
- // check https://android-rebuilds.beuc.net/ for availability of free
build tools
- build_tools_version = "33.0.1"
// should debug build types be minified with D8 as well? good for
catching issues early
minify_debug = true
}
@@ -17,7 +15,7 @@ buildscript {
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.4.2'
+ classpath 'com.android.tools.build:gradle:8.1.2'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath
"androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
diff --git a/cashier/build.gradle b/cashier/build.gradle
index dd8d787..23cbe05 100644
--- a/cashier/build.gradle
+++ b/cashier/build.gradle
@@ -23,9 +23,7 @@ plugins {
android {
namespace 'net.taler.cashier'
- compileSdkVersion 33
- //noinspection GradleDependency
- buildToolsVersion "$build_tools_version"
+ compileSdk 34
defaultConfig {
applicationId "net.taler.cashier"
@@ -48,15 +46,16 @@ android {
}
compileOptions {
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "17"
}
buildFeatures {
+ buildConfig = true
viewBinding = true
}
packagingOptions {
@@ -67,7 +66,7 @@ android {
lint {
abortOnError true
- ignore 'WrongConstant'
+ warning 'WrongConstant'
ignoreWarnings false
}
}
diff --git a/cashier/proguard-rules.pro b/cashier/proguard-rules.pro
index ced7b5c..9928f24 100644
--- a/cashier/proguard-rules.pro
+++ b/cashier/proguard-rules.pro
@@ -26,3 +26,5 @@
# androidx.security:security-crypto
# https://github.com/google/tink/issues/361
-keep class * extends
com.google.crypto.tink.shaded.protobuf.GeneratedMessageLite { *; }
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
index 6e8a3db..3085bef 100644
--- a/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
+++ b/cashier/src/main/java/net/taler/cashier/config/ConfigFragment.kt
@@ -39,7 +39,7 @@ import net.taler.cashier.databinding.FragmentConfigBinding
import net.taler.common.exhaustive
import net.taler.common.showError
-private const val URL_BANK_TEST =
"https://bank.demo.taler.net/demobanks/default";
+private const val URL_BANK_TEST = "https://bank.demo.taler.net";
private const val URL_BANK_TEST_REGISTER =
"https://bank.demo.taler.net/webui/#/register";
class ConfigFragment : Fragment() {
diff --git a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
index c79fd12..6c6c5cf 100644
--- a/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
+++ b/cashier/src/main/java/net/taler/cashier/config/ConfigManager.kt
@@ -114,7 +114,7 @@ class ConfigManager(
}
private suspend fun checkConfig(config: Config) =
withContext(Dispatchers.IO) {
- val url = "${config.bankUrl}/integration-api/config"
+ val url = "${config.bankUrl}/config"
Log.d(TAG, "Checking config: $url")
val configResponse = response {
httpClient.get(url).body<ConfigResponse>()
@@ -125,7 +125,7 @@ class ConfigManager(
// we need to check an endpoint that requires authentication as
well
// to see if the credentials are valid
val balanceResponse = response {
- val authUrl =
"${config.bankUrl}/access-api/accounts/${config.username}"
+ val authUrl = "${config.bankUrl}/accounts/${config.username}"
Log.d(TAG, "Checking auth: $authUrl")
httpClient.get(authUrl) {
header(Authorization, config.basicAuth)
diff --git a/gradle.properties b/gradle.properties
index 5804e8b..a1c40bf 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,6 +18,7 @@ org.gradle.configureondemand=true
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=false
+android.nonTransitiveRClass=false
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
kotlin.mpp.stability.nowarn=true
diff --git a/gradle/wrapper/gradle-wrapper.properties
b/gradle/wrapper/gradle-wrapper.properties
index 752e3d5..8111dbf 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
#Fri Aug 27 15:56:47 CEST 2021
distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-all.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
diff --git a/merchant-lib/build.gradle b/merchant-lib/build.gradle
index 2892cd6..5d4bc48 100644
--- a/merchant-lib/build.gradle
+++ b/merchant-lib/build.gradle
@@ -21,9 +21,8 @@ plugins {
}
android {
- compileSdkVersion 33
- //noinspection GradleDependency
- buildToolsVersion "$build_tools_version"
+ namespace 'net.taler.merchantlib'
+ compileSdk 34
defaultConfig {
minSdkVersion 21
@@ -42,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 {
@@ -62,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-terminal/build.gradle b/merchant-terminal/build.gradle
index f55f574..df57332 100644
--- a/merchant-terminal/build.gradle
+++ b/merchant-terminal/build.gradle
@@ -7,9 +7,7 @@ plugins {
android {
namespace 'net.taler.merchantpos'
- compileSdkVersion 33
- //noinspection GradleDependency
- buildToolsVersion "$build_tools_version"
+ compileSdk 34
defaultConfig {
applicationId "net.taler.merchantpos"
@@ -34,15 +32,16 @@ android {
}
compileOptions {
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
}
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "17"
}
buildFeatures {
+ buildConfig = true
viewBinding = true
}
@@ -69,7 +68,7 @@ dependencies {
implementation "com.google.android.material:material:$material_version"
implementation
"androidx.constraintlayout:constraintlayout:$constraintlayout_version"
- implementation "androidx.recyclerview:recyclerview:1.3.0"
+ implementation "androidx.recyclerview:recyclerview:1.3.1"
implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
// Navigation
@@ -79,5 +78,5 @@ dependencies {
implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
testImplementation 'androidx.test.ext:junit:1.1.5'
- testImplementation 'org.robolectric:robolectric:4.8.2'
+ testImplementation 'org.robolectric:robolectric:4.10.3'
}
diff --git a/merchant-terminal/proguard-rules.pro
b/merchant-terminal/proguard-rules.pro
index f417733..6acde1a 100644
--- a/merchant-terminal/proguard-rules.pro
+++ b/merchant-terminal/proguard-rules.pro
@@ -22,3 +22,5 @@
#noinspection ShrinkerUnresolvedReference
-keep class net.taler.merchantpos.** {*;}
+
+-dontwarn org.slf4j.impl.StaticLoggerBinder
diff --git a/taler-kotlin-android/build.gradle
b/taler-kotlin-android/build.gradle
index 8cb99ed..e005317 100644
--- a/taler-kotlin-android/build.gradle
+++ b/taler-kotlin-android/build.gradle
@@ -22,8 +22,7 @@ plugins {
android {
namespace 'net.taler.common'
- compileSdkVersion 32
- buildToolsVersion "$build_tools_version"
+ compileSdk 34
defaultConfig {
minSdkVersion 21
@@ -45,6 +44,13 @@ android {
buildFeatures {
viewBinding = true
}
+ compileOptions {
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
+ }
+ kotlinOptions {
+ jvmTarget = "17"
+ }
packagingOptions {
resources {
excludes += ['META-INF/*.kotlin_module']
@@ -53,8 +59,8 @@ android {
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.6.0'
- implementation 'androidx.core:core-ktx:1.9.0'
+ implementation 'androidx.appcompat:appcompat:1.6.1'
+ implementation 'androidx.core:core-ktx:1.12.0'
implementation
"androidx.constraintlayout:constraintlayout:$constraintlayout_version"
// Navigation
@@ -68,7 +74,7 @@ dependencies {
implementation 'com.google.zxing:core:3.5.0' // needs minSdkVersion 24+
or desugar
// JSON parsing and serialization
- api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.4.1'
+ api 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1'
testImplementation "junit:junit:$junit_version"
testImplementation 'org.json:json:20220320'
}
diff --git a/wallet/build.gradle b/wallet/build.gradle
index 8f22e1b..fa0239c 100644
--- a/wallet/build.gradle
+++ b/wallet/build.gradle
@@ -35,8 +35,7 @@ def gitCommit = { ->
android {
namespace 'net.taler.wallet'
- compileSdkVersion 33
- buildToolsVersion "$build_tools_version"
+ compileSdk 34
defaultConfig {
applicationId "net.taler.wallet"
@@ -56,7 +55,7 @@ android {
proguardFiles
getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
- flavorDimensions "distributionChannel"
+ flavorDimensions = ["distributionChannel"]
productFlavors {
fdroid {
dimension "distributionChannel"
@@ -74,22 +73,23 @@ android {
}
compileOptions {
- sourceCompatibility = 1.8
- targetCompatibility = 1.8
+ sourceCompatibility = JavaVersion.VERSION_17
+ targetCompatibility = JavaVersion.VERSION_17
// Flag to enable support for the new language APIs for zxing
coreLibraryDesugaringEnabled true
}
kotlinOptions {
- jvmTarget = "1.8"
+ jvmTarget = "17"
}
composeOptions {
- kotlinCompilerExtensionVersion "1.4.6"
+ kotlinCompilerExtensionVersion "1.5.3"
}
buildFeatures {
+ buildConfig true
viewBinding true
compose true
}
@@ -114,24 +114,24 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
- implementation 'androidx.preference:preference-ktx:1.2.0'
+ implementation 'androidx.preference:preference-ktx:1.2.1'
implementation "com.google.android.material:material:$material_version"
implementation
"androidx.constraintlayout:constraintlayout:$constraintlayout_version"
- implementation "androidx.browser:browser:1.5.0"
+ implementation "androidx.browser:browser:1.6.0"
// Compose
- implementation platform('androidx.compose:compose-bom:2023.05.00')
+ implementation platform('androidx.compose:compose-bom:2023.10.00')
implementation 'androidx.compose.material3:material3'
implementation 'androidx.compose.material:material-icons-extended'
implementation "androidx.compose.runtime:runtime-livedata"
implementation "androidx.lifecycle:lifecycle-viewmodel-compose"
implementation
"com.google.accompanist:accompanist-themeadapter-material3:0.28.0"
- implementation 'androidx.activity:activity-compose:1.7.1'
+ implementation 'androidx.activity:activity-compose:1.8.0'
implementation 'androidx.compose.ui:ui-tooling-preview'
debugImplementation 'androidx.compose.ui:ui-tooling'
// Lists and Selection
- implementation "androidx.recyclerview:recyclerview:1.3.0"
+ implementation "androidx.recyclerview:recyclerview:1.3.1"
implementation "androidx.recyclerview:recyclerview-selection:1.1.0"
// Navigation Library
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-taler-android] branch master updated: upgrade all the things!,
gnunet <=