Skip to content

Commit 436a67a

Browse files
Merge pull request #40 from synonymdev/feat/kotlin-serializable
feat: serializable kotlin types
2 parents e8cc3ab + bb7dda2 commit 436a67a

File tree

24 files changed

+7756
-5076
lines changed

24 files changed

+7756
-5076
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "bitkitcore"
3-
version = "0.1.17"
3+
version = "0.1.18"
44
edition = "2021"
55

66
[lib]
@@ -9,7 +9,7 @@ name = "bitkitcore"
99
path = "src/lib.rs"
1010

1111
[dependencies]
12-
uniffi = { version = "0.27.3", features = [ "cli", "bindgen" ] }
12+
uniffi = { version = "0.28.3", features = [ "cli", "bindgen" ] }
1313
serde_json = "1.0.114"
1414
serde = { version = "^1.0.209", features = ["derive"] }
1515
tokio = { version = "1.40.0", features = ["rt", "rt-multi-thread", "macros"] }

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
import PackageDescription
55

6-
let tag = "v0.1.17"
7-
let checksum = "5560bcf732e124c56c67617d53a2008360732d2758912b55ef97ab82672b3605"
6+
let tag = "v0.1.18"
7+
let checksum = "6d3f142a7082b42a12d1b2c89dd9fb04c7db92cc56a430e52c78d2a95128c7f2"
88
let url = "https://github.com/synonymdev/bitkit-core/releases/download/\(tag)/BitkitCore.xcframework.zip"
99

1010
let package = Package(

bindings/android/build.gradle.kts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,10 @@ buildscript {
88
}
99
}
1010

11+
plugins {
12+
kotlin("android") version "1.9.20" apply false
13+
kotlin("plugin.serialization") version "1.9.20" apply false
14+
}
15+
1116
group = providers.gradleProperty("group").orNull ?: "com.synonym"
1217
version = providers.gradleProperty("version").orNull ?: "0.0.0"

bindings/android/gradle.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ android.useAndroidX=true
33
android.enableJetifier=true
44
kotlin.code.style=official
55
group=com.synonym
6-
version=0.1.17
6+
version=0.1.18

bindings/android/lib/build.gradle.kts

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
plugins {
22
id("com.android.library")
3-
id("org.jetbrains.kotlin.android") version "1.9.10"
3+
kotlin("android")
4+
kotlin("plugin.serialization")
45

56
id("maven-publish")
67
id("signing")
@@ -52,13 +53,9 @@ dependencies {
5253
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
5354
implementation("androidx.appcompat:appcompat:1.6.1")
5455
implementation("androidx.core:core-ktx:1.12.0")
56+
implementation("org.jetbrains.kotlinx:atomicfu:0.23.1")
57+
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.0")
5558
api("org.slf4j:slf4j-api:1.7.36")
56-
57-
androidTestImplementation("com.github.tony19:logback-android:2.0.0")
58-
androidTestImplementation("androidx.test.ext:junit:1.1.5")
59-
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
60-
androidTestImplementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.7.3")
61-
androidTestImplementation("org.jetbrains.kotlin:kotlin-test-junit")
6259
}
6360

6461
afterEvaluate {
-1.02 MB
Binary file not shown.
Binary file not shown.
-1.07 MB
Binary file not shown.
-1.04 MB
Binary file not shown.

0 commit comments

Comments
 (0)