Skip to content

Commit 6a2038e

Browse files
committed
Merge branch 'chore/update-deps' into fix/restore-back-button
2 parents 35630a7 + 2b924bc commit 6a2038e

File tree

92 files changed

+901
-635
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+901
-635
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
*.iml
22
.gradle
33
.idea
4+
!.idea/codeStyles/
45
.kotlin
56
.DS_Store
67
/build

.idea/codeStyles/Project.xml

Lines changed: 175 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/codeStyles/codeStyleConfig.xml

Lines changed: 5 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle.kts

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import io.gitlab.arturbosch.detekt.Detekt
33
import org.gradle.api.tasks.testing.logging.TestExceptionFormat
44
import org.gradle.api.tasks.testing.logging.TestLogEvent
55
import org.jetbrains.kotlin.compose.compiler.gradle.ComposeFeatureFlag
6+
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
67
import java.io.FileInputStream
78
import java.util.Properties
89

@@ -40,11 +41,11 @@ val locales = listOf("en", "ar", "ca", "cs", "de", "el", "es", "fr", "it", "nl",
4041

4142
android {
4243
namespace = "to.bitkit"
43-
compileSdk = 35
44+
compileSdk = 36
4445
defaultConfig {
4546
applicationId = "to.bitkit"
4647
minSdk = 28
47-
targetSdk = 35
48+
targetSdk = 36
4849
versionCode = 15
4950
versionName = "0.0.15"
5051
testInstrumentationRunner = "to.bitkit.test.HiltTestRunner"
@@ -127,8 +128,15 @@ android {
127128
sourceCompatibility = JavaVersion.VERSION_11
128129
targetCompatibility = JavaVersion.VERSION_11
129130
}
130-
kotlinOptions {
131-
jvmTarget = "11"
131+
kotlin {
132+
compilerOptions {
133+
jvmTarget = JvmTarget.JVM_11
134+
freeCompilerArgs.addAll(
135+
listOf(
136+
"-XXLanguage:+PropertyParamAnnotationDefaultTargetMode",
137+
)
138+
)
139+
}
132140
}
133141
buildFeatures {
134142
buildConfig = true
@@ -168,7 +176,6 @@ android {
168176

169177
composeCompiler {
170178
featureFlags = setOf(
171-
ComposeFeatureFlag.StrongSkipping.disabled(),
172179
ComposeFeatureFlag.OptimizeNonSkippingGroups,
173180
)
174181
reportsDestination = layout.buildDirectory.dir("compose_compiler")
@@ -196,7 +203,7 @@ dependencies {
196203
implementation(libs.bouncycastle.provider.jdk)
197204
implementation(libs.ldk.node.android) { exclude(group = "net.java.dev.jna", module = "jna") }
198205
implementation(libs.bitkit.core)
199-
implementation(libs.vss)
206+
implementation(libs.vss.client)
200207
// Firebase
201208
implementation(platform(libs.firebase.bom))
202209
implementation(libs.firebase.messaging)

app/src/androidTest/java/to/bitkit/ui/screens/widgets/blocks/BlocksEditScreenTest.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ class BlocksEditScreenTest {
3030
@Test
3131
fun testBlocksEditScreenWithDefaultPreferences() {
3232
// Arrange
33-
var closeClicked = false
3433
var backClicked = false
3534
var blockClicked = false
3635
var timeClicked = false
@@ -45,7 +44,6 @@ class BlocksEditScreenTest {
4544
composeTestRule.setContent {
4645
AppThemeSurface {
4746
BlocksEditContent(
48-
onClose = { closeClicked = true },
4947
onBack = { backClicked = true },
5048
onClickShowBlock = { blockClicked = true },
5149
onClickShowTime = { timeClicked = true },
@@ -111,7 +109,6 @@ class BlocksEditScreenTest {
111109
composeTestRule.setContent {
112110
AppThemeSurface {
113111
BlocksEditContent(
114-
onClose = {},
115112
onBack = {},
116113
onClickShowBlock = {},
117114
onClickShowTime = {},
@@ -143,7 +140,6 @@ class BlocksEditScreenTest {
143140
composeTestRule.setContent {
144141
AppThemeSurface {
145142
BlocksEditContent(
146-
onClose = {},
147143
onBack = {},
148144
onClickShowBlock = {},
149145
onClickShowTime = {},
@@ -177,7 +173,6 @@ class BlocksEditScreenTest {
177173
composeTestRule.setContent {
178174
AppThemeSurface {
179175
BlocksEditContent(
180-
onClose = {},
181176
onBack = {},
182177
onClickShowBlock = {},
183178
onClickShowTime = {},
@@ -220,7 +215,6 @@ class BlocksEditScreenTest {
220215
composeTestRule.setContent {
221216
AppThemeSurface {
222217
BlocksEditContent(
223-
onClose = {},
224218
onBack = {},
225219
onClickShowBlock = { blockClicked = true },
226220
onClickShowTime = { timeClicked = true },
@@ -277,7 +271,6 @@ class BlocksEditScreenTest {
277271
composeTestRule.setContent {
278272
AppThemeSurface {
279273
BlocksEditContent(
280-
onClose = {},
281274
onBack = {},
282275
onClickShowBlock = {},
283276
onClickShowTime = {},
@@ -305,7 +298,6 @@ class BlocksEditScreenTest {
305298
composeTestRule.setContent {
306299
AppThemeSurface {
307300
BlocksEditContent(
308-
onClose = {},
309301
onBack = {},
310302
onClickShowBlock = {},
311303
onClickShowTime = {},

0 commit comments

Comments
 (0)