Skip to content

Commit

Permalink
[#1438] Dependency update
Browse files Browse the repository at this point in the history
* [#1438] Gradle 8.7

* AndroidX + Kotlin 1.9.23

* AGP 8.3.0

* Detekt 1.23.6 + Detekt Compose 0.3.15

* Dokka 1.9.20

* FooJay 0.8.0

* Ktlint 1.2.1

* Bip-39 1.0.8

* Remove coroutines-okhttp dependency

* Google Material 1.11.0

* gRPC Java 1.63.0

Removed `enableFullStreamDecompression()` as it had no effect as described in https://github.com/grpc/grpc-java/releases/tag/v1.61.0

* Gson 2.10.1

* Jacoco 0.8.12

* JUnit 5.10.2

* Kotlinx Coroutines 1.8.0

* Kotlin Immutable Collections 0.3.7

* Mockito 5.11.0

Removed unnecessary Mockito Kotlin dependency

* Protoc 4.26.1

* Changelog update

* Bump lib version

To produce a new snapshot version
  • Loading branch information
HonzaR committed Apr 15, 2024
1 parent 96b99be commit 6a96fa3
Show file tree
Hide file tree
Showing 18 changed files with 227 additions and 228 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,12 @@ and this library adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Gradle 8.7
- Android Gradle Plugin 8.3.0
- Kotlin 1.9.23
- Other dependencies update

## [2.1.0] - 2024-04-09

### Added
Expand Down
56 changes: 28 additions & 28 deletions build-conventions/buildscript-gradle.lockfile
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
# This is a Gradle generated file for dependency locking.
# Manual edits can break the build and are not advised.
# This file is expected to be part of source control.
org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.2.1=classpath
org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.2.1=classpath
org.gradle.kotlin.kotlin-dsl:org.gradle.kotlin.kotlin-dsl.gradle.plugin:4.3.0=classpath
org.gradle.kotlin:gradle-kotlin-dsl-plugins:4.3.0=classpath
org.jetbrains.intellij.deps:trove4j:1.0.20200330=classpath
org.jetbrains.kotlin:kotlin-android-extensions:1.9.20=classpath
org.jetbrains.kotlin:kotlin-assignment:1.9.20=classpath
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.20=classpath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.20=classpath
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.20=classpath
org.jetbrains.kotlin:kotlin-daemon-client:1.9.20=classpath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20=classpath
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.20=classpath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.20=classpath
org.jetbrains.kotlin:kotlin-native-utils:1.9.20=classpath
org.jetbrains.kotlin:kotlin-project-model:1.9.20=classpath
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.20=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.9.20=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.20=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.20=classpath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.20=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.9.20=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.9.20=classpath
org.jetbrains.kotlin:kotlin-util-io:1.9.20=classpath
org.jetbrains.kotlin:kotlin-util-klib:1.9.20=classpath
org.jetbrains.kotlin:kotlin-android-extensions:1.9.22=classpath
org.jetbrains.kotlin:kotlin-assignment:1.9.22=classpath
org.jetbrains.kotlin:kotlin-build-tools-api:1.9.22=classpath
org.jetbrains.kotlin:kotlin-compiler-embeddable:1.9.22=classpath
org.jetbrains.kotlin:kotlin-compiler-runner:1.9.22=classpath
org.jetbrains.kotlin:kotlin-daemon-client:1.9.22=classpath
org.jetbrains.kotlin:kotlin-daemon-embeddable:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-annotations:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-api:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea-proto:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-idea:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin-model:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.22=classpath
org.jetbrains.kotlin:kotlin-gradle-plugins-bom:1.9.22=classpath
org.jetbrains.kotlin:kotlin-klib-commonizer-api:1.9.22=classpath
org.jetbrains.kotlin:kotlin-native-utils:1.9.22=classpath
org.jetbrains.kotlin:kotlin-project-model:1.9.22=classpath
org.jetbrains.kotlin:kotlin-sam-with-receiver:1.9.22=classpath
org.jetbrains.kotlin:kotlin-scripting-common:1.9.22=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-embeddable:1.9.22=classpath
org.jetbrains.kotlin:kotlin-scripting-compiler-impl-embeddable:1.9.22=classpath
org.jetbrains.kotlin:kotlin-scripting-jvm:1.9.22=classpath
org.jetbrains.kotlin:kotlin-stdlib:1.9.22=classpath
org.jetbrains.kotlin:kotlin-tooling-core:1.9.22=classpath
org.jetbrains.kotlin:kotlin-util-io:1.9.22=classpath
org.jetbrains.kotlin:kotlin-util-klib:1.9.22=classpath
org.jetbrains.kotlinx:kotlinx-coroutines-core-jvm:1.5.0=classpath
org.jetbrains:annotations:13.0=classpath
empty=
252 changes: 125 additions & 127 deletions build-conventions/gradle.lockfile

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() {
)
}

if (this is CommonExtension<*, *, *, *, *>) {
if (this is CommonExtension<*, *, *, *, *, *>) {
kotlinOptions {
jvmTarget = project.property("ANDROID_JVM_TARGET").toString()
allWarningsAsErrors = project.property("ZCASH_IS_TREAT_WARNINGS_AS_ERRORS").toString().toBoolean()
Expand All @@ -185,6 +185,6 @@ fun com.android.build.gradle.BaseExtension.configureBaseExtension() {
}
}

fun CommonExtension<*, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
fun CommonExtension<*, *, *, *, *, *>.kotlinOptions(block: KotlinJvmOptions.() -> Unit) {
(this as ExtensionAware).extensions.configure("kotlinOptions", block)
}
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,16 @@ class MainActivity :
appBarConfiguration =
AppBarConfiguration(
setOf(
R.id.nav_home, R.id.nav_address, R.id.nav_balance, R.id.nav_block, R.id.nav_private_key,
R.id.nav_latest_height, R.id.nav_block_range,
R.id.nav_transactions, R.id.nav_utxos, R.id.nav_send
R.id.nav_home,
R.id.nav_address,
R.id.nav_balance,
R.id.nav_block,
R.id.nav_private_key,
R.id.nav_latest_height,
R.id.nav_block_range,
R.id.nav_transactions,
R.id.nav_utxos,
R.id.nav_send
),
drawerLayout
)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
Expand Down Expand Up @@ -84,7 +84,7 @@ private fun AddressesTopAppBar(onBack: () -> Unit) {
onClick = onBack
) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.outlined.Autorenew
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
Expand Down Expand Up @@ -82,7 +82,7 @@ private fun BalanceTopAppBar(
onClick = onBack
) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -104,7 +104,7 @@ private fun SendTopAppBar(onBack: () -> Unit) {
onClick = onBack
) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.verticalScroll
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material3.Button
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
Expand Down Expand Up @@ -112,7 +112,7 @@ private fun ServerTopAppBar(onBack: () -> Unit) {
onClick = onBack
) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.foundation.lazy.items
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.automirrored.filled.ArrowBack
import androidx.compose.material.icons.filled.ArrowBack
import androidx.compose.material.icons.outlined.Autorenew
import androidx.compose.material3.Button
Expand Down Expand Up @@ -97,7 +98,7 @@ private fun TransactionsTopAppBar(
onClick = onBack
) {
Icon(
imageVector = Icons.Filled.ArrowBack,
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
contentDescription = null
)
}
Expand Down
68 changes: 33 additions & 35 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ ZCASH_ASCII_GPG_KEY=
# Configures whether release is an unstable snapshot, therefore published to the snapshot repository.
IS_SNAPSHOT=true

LIBRARY_VERSION=2.1.0
LIBRARY_VERSION=2.1.1

# Kotlin compiler warnings can be considered errors, failing the build.
ZCASH_IS_TREAT_WARNINGS_AS_ERRORS=true
Expand Down Expand Up @@ -83,66 +83,64 @@ ANDROID_COMPILE_SDK_VERSION=34
# - Clang major version in backend-lib/build.rs
ANDROID_NDK_VERSION=26.1.10909125

ANDROID_GRADLE_PLUGIN_VERSION=8.1.1
DETEKT_VERSION=1.23.0
DETEKT_COMPOSE_RULES_VERSION=0.3.5
DOKKA_VERSION=1.9.10
EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.12.2
ANDROID_GRADLE_PLUGIN_VERSION=8.3.0
DETEKT_VERSION=1.23.6
DETEKT_COMPOSE_RULES_VERSION=0.3.15
DOKKA_VERSION=1.9.20
EMULATOR_WTF_GRADLE_PLUGIN_VERSION=0.16.2
FLANK_VERSION=23.10.1
# When changing this, be sure to change build-conventions/gradle.properties#FOOJAY_TOOLCHAIN_RESOLVER_VERSION too
FOOJAY_TOOLCHAIN_RESOLVER_VERSION=0.5.0
FOOJAY_TOOLCHAIN_RESOLVER_VERSION=0.8.0
FULLADLE_VERSION=0.17.4
GRADLE_VERSIONS_PLUGIN_VERSION=0.51.0
KSP_VERSION=1.8.20-1.0.10
KTLINT_VERSION=1.1.0
KSP_VERSION=1.9.23-1.0.20
KTLINT_VERSION=1.2.1
PROTOBUF_GRADLE_PLUGIN_VERSION=0.9.4
RUST_GRADLE_PLUGIN_VERSION=0.9.3

ANDROIDX_ACTIVITY_VERSION=1.8.1
ANDROIDX_ANNOTATION_VERSION=1.7.0
ANDROIDX_ACTIVITY_VERSION=1.8.2
ANDROIDX_ANNOTATION_VERSION=1.7.1
ANDROIDX_APPCOMPAT_VERSION=1.6.1
ANDROIDX_COMPOSE_COMPILER_VERSION=1.5.7
ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.1.1
ANDROIDX_COMPOSE_VERSION=1.6.2
ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION=1.5.4
ANDROIDX_COMPOSE_COMPILER_VERSION=1.5.11
ANDROIDX_COMPOSE_MATERIAL3_VERSION=1.2.1
ANDROIDX_COMPOSE_VERSION=1.6.5
ANDROIDX_COMPOSE_MATERIAL_ICONS_VERSION=1.6.5
ANDROIDX_CONSTRAINT_LAYOUT_VERSION=2.1.4
ANDROIDX_CORE_VERSION=1.12.0
ANDROIDX_DATABASE_VERSION=2.4.0
ANDROIDX_ESPRESSO_VERSION=3.5.1
ANDROIDX_LIFECYCLE_VERSION=2.6.2
ANDROIDX_LIFECYCLE_VERSION=2.7.0
ANDROIDX_MULTIDEX_VERSION=2.0.1
ANDROIDX_NAVIGATION_VERSION=2.7.5
ANDROIDX_NAVIGATION_COMPOSE_VERSION=2.7.5
ANDROIDX_NAVIGATION_FRAGMENT_VERSION=2.7.5
ANDROIDX_NAVIGATION_VERSION=2.7.7
ANDROIDX_NAVIGATION_COMPOSE_VERSION=2.7.7
ANDROIDX_NAVIGATION_FRAGMENT_VERSION=2.7.7
ANDROIDX_PROFILE_INSTALLER_VERSION=1.3.1
ANDROIDX_ROOM_VERSION=2.5.1
ANDROIDX_SECURITY_CRYPTO_VERSION=1.1.0-alpha06
ANDROIDX_TEST_JUNIT_VERSION=1.1.5
ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.2
ANDROIDX_TEST_MACROBENCHMARK_VERSION=1.2.3
ANDROIDX_TEST_ORCHESTRATOR_VERSION=1.4.2
ANDROIDX_TEST_CORE_VERSION=1.5.0
ANDROIDX_TEST_RUNNER_VERSION=1.5.2
ANDROIDX_TRACING_VERSION=1.3.0-alpha02
ANDROIDX_UI_AUTOMATOR_VERSION=2.3.0-alpha05
BIP39_VERSION=1.0.7
ANDROIDX_UI_AUTOMATOR_VERSION=2.3.0
CORE_LIBRARY_DESUGARING_VERSION=2.0.4
COROUTINES_OKHTTP=1.0
GOOGLE_MATERIAL_VERSION=1.9.0
GOOGLE_MATERIAL_VERSION=1.11.0
GRPC_KOTLIN_VERSION=1.4.1
GRPC_VERSION=1.60.0
GSON_VERSION=2.9.0
JACOCO_VERSION=0.8.9
GRPC_VERSION=1.63.0
GSON_VERSION=2.10.1
JACOCO_VERSION=0.8.12
JAVAX_ANNOTATION_VERSION=1.3.2
JUNIT_VERSION=5.9.3
KOTLINX_COROUTINES_VERSION=1.7.3
JUNIT_VERSION=5.10.2
KOTLINX_COROUTINES_VERSION=1.8.0
KOTLINX_DATETIME_VERSION=0.5.0
KOTLINX_IMMUTABLE_COLLECTIONS_VERSION=0.3.6
KOTLIN_VERSION=1.9.21
MOCKITO_KOTLIN_VERSION=2.2.0
MOCKITO_VERSION=5.8.0
PROTOC_VERSION=3.25.1
KOTLINX_IMMUTABLE_COLLECTIONS_VERSION=0.3.7
KOTLIN_VERSION=1.9.23
MOCKITO_VERSION=5.11.0
PROTOC_VERSION=4.26.1
ZCASH_WALLET_PLUGINS_VERSION=1.0.1

BIP39_VERSION=1.0.8

# This shouldn't be changed, as Android doesn't support targets beyond Java 8
ANDROID_JVM_TARGET=1.8

Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionSha256Sum=9d926787066a081739e8200858338b4a69e837c3a821a33aca9db09dd4a41026
distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
distributionSha256Sum=544c35d6bd849ae8a5ed0bcea39ba677dc40f49df7d1835561582da2009b961d
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
20 changes: 10 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,11 @@ set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand All @@ -57,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe

if exist "%JAVA_EXE%" goto execute

echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
echo. 1>&2
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
echo. 1>&2
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
echo location of your Java installation. 1>&2

goto fail

Expand Down
1 change: 0 additions & 1 deletion lightwallet-client-lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ dependencies {
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.core)
androidTestImplementation(libs.coroutines.okhttp)
androidTestImplementation(libs.kotlin.test)
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ internal class AndroidChannelFactory(context: android.content.Context) : Channel
return AndroidChannelBuilder
.forAddress(endpoint.host, endpoint.port)
.context(context)
.enableFullStreamDecompression()
.apply {
if (endpoint.isSecure) {
useTransportSecurity()
Expand Down
2 changes: 0 additions & 2 deletions sdk-lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -122,12 +122,10 @@ dependencies {
// was buggy, crashing in several places. It also would require a separate test flavor because it's minimum API 26
// because "JUnit 5 uses Java 8-specific APIs that didn't exist on Android before the Oreo release."
androidTestImplementation(libs.androidx.multidex)
androidTestImplementation(libs.mockito.kotlin)
androidTestImplementation(libs.mockito.android)
androidTestImplementation(libs.androidx.test.runner)
androidTestImplementation(libs.androidx.test.junit)
androidTestImplementation(libs.androidx.test.core)
androidTestImplementation(libs.coroutines.okhttp)
androidTestImplementation(libs.kotlin.test)
androidTestImplementation(libs.kotlinx.coroutines.test)

Expand Down

0 comments on commit 6a96fa3

Please sign in to comment.