Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,13 @@ Some internal libraries are distributed via GitHub Packages. Configure credentia
- `GITHUB_ACTOR` (your username)
- `GITHUB_TOKEN` (token with `read:packages`)

- Or `~/.gradle/local.properties`
- `PROJECT_ROOT/local.properties` or `~/.gradle/gradle.properties`
- `gpr.user=YOUR_GITHUB_USERNAME`
- `gpr.key=YOUR_GITHUB_TOKEN`

See also:
- [bitkit-core android bindings](https://github.com/synonymdev/bitkit-core/tree/master/bindings/android#installation)
- [vss-rust-client-ffi android bindings](https://github.com/synonymdev/vss-rust-client-ffi/tree/master/bindings/android#installation)

### References

Expand Down
3 changes: 1 addition & 2 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,6 @@ tasks.withType<io.gitlab.arturbosch.detekt.Detekt>().configureEach {
}

dependencies {
implementation(project(":libs:vss-client"))
implementation(fileTree("libs") { include("*.aar") })
implementation(libs.jna) { artifact { type = "aar" } }
implementation(platform(libs.kotlin.bom))
Expand All @@ -198,6 +197,7 @@ dependencies {
implementation(libs.bouncycastle.provider.jdk)
implementation(libs.ldk.node.android) { exclude(group = "net.java.dev.jna", module = "jna") }
implementation(libs.bitkitcore)
implementation(libs.vss)
// Firebase
implementation(platform(libs.firebase.bom))
implementation(libs.firebase.messaging)
Expand Down Expand Up @@ -227,7 +227,6 @@ dependencies {
implementation(libs.charts)
implementation(libs.haze)
implementation(libs.haze.materials)

// Compose Navigation
implementation(libs.navigation.compose)
androidTestImplementation(libs.navigation.testing)
Expand Down
8 changes: 4 additions & 4 deletions app/src/main/java/to/bitkit/data/backup/VssBackupClient.kt
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package to.bitkit.data.backup

import com.synonym.vssclient.VssItem
import com.synonym.vssclient.vssGet
import com.synonym.vssclient.vssNewClient
import com.synonym.vssclient.vssStore
import kotlinx.coroutines.CompletableDeferred
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.withContext
import kotlinx.coroutines.withTimeout
import to.bitkit.di.BgDispatcher
import to.bitkit.env.Env
import to.bitkit.utils.Logger
import uniffi.vss_rust_client_ffi.VssItem
import uniffi.vss_rust_client_ffi.vssGet
import uniffi.vss_rust_client_ffi.vssNewClient
import uniffi.vss_rust_client_ffi.vssStore
import javax.inject.Inject
import javax.inject.Singleton
import kotlin.time.Duration.Companion.seconds
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/to/bitkit/repositories/BackupRepo.kt
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package to.bitkit.repositories

import android.content.Context
import com.synonym.vssclient.VssItem
import dagger.hilt.android.qualifiers.ApplicationContext
import kotlinx.coroutines.CoroutineDispatcher
import kotlinx.coroutines.CoroutineScope
Expand Down Expand Up @@ -29,7 +30,6 @@ import to.bitkit.models.BackupItemStatus
import to.bitkit.models.Toast
import to.bitkit.ui.shared.toast.ToastEventBus
import to.bitkit.utils.Logger
import uniffi.vss_rust_client_ffi.VssItem
import javax.inject.Inject
import javax.inject.Singleton

Expand Down
1 change: 1 addition & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,7 @@ test-junit-ext = { module = "androidx.test.ext:junit", version.ref = "junitExt"
test-mockito-kotlin = { module = "org.mockito.kotlin:mockito-kotlin", version.ref = "mockitoKotlin" }
test-robolectric = { module = "org.robolectric:robolectric", version.ref = "robolectric" }
test-turbine = { group = "app.cash.turbine", name = "turbine", version.ref = "turbine" }
vss = { module = "com.synonym:vss-client-android", version = "0.1.0" }
work-runtime-ktx = { module = "androidx.work:work-runtime-ktx", version.ref = "workRuntimeKtx" }
zxing = { module = "com.google.zxing:core", version.ref = "zxing" }
lottie = { module = "com.airbnb.android:lottie-compose", version.ref = "lottieVersion" }
Expand Down
5 changes: 0 additions & 5 deletions libs/vss-client/.gitignore

This file was deleted.

15 changes: 0 additions & 15 deletions libs/vss-client/README.md

This file was deleted.

45 changes: 0 additions & 45 deletions libs/vss-client/build.gradle.kts

This file was deleted.

Loading