diff --git a/tangem-core/build.gradle b/tangem-core/build.gradle index fe6ed6638a..220c949038 100644 --- a/tangem-core/build.gradle +++ b/tangem-core/build.gradle @@ -8,11 +8,19 @@ group = "$jitpackSdk.group" version "$jitpackSdk.version" dependencies { + // kotlin implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$versions.kotlin" + implementation "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin" + + // crypto implementation "com.madgag.spongycastle:core:1.58.0.0" implementation "com.madgag.spongycastle:prov:1.58.0.0" implementation 'net.i2p.crypto:eddsa:0.3.0' - implementation "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin" + + // misc + implementation 'com.google.code.gson:gson:2.8.6' + + // tests testImplementation 'org.junit.jupiter:junit-jupiter-api:5.5.2' testImplementation "com.google.truth:truth:1.0" } diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/converter/ResponseConverter.kt b/tangem-core/src/main/java/com/tangem/commands/common/ResponseConverter.kt similarity index 97% rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/converter/ResponseConverter.kt rename to tangem-core/src/main/java/com/tangem/commands/common/ResponseConverter.kt index 392bdc9f96..54d38798a1 100644 --- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/converter/ResponseConverter.kt +++ b/tangem-core/src/main/java/com/tangem/commands/common/ResponseConverter.kt @@ -1,9 +1,9 @@ -package com.tangem.tangem_sdk_new.converter +package com.tangem.commands.common import com.google.gson.* import com.tangem.commands.* +import com.tangem.common.extensions.print import com.tangem.common.extensions.toHexString -import com.tangem.tangem_sdk_new.extensions.print import java.lang.reflect.Type import java.text.DateFormat import java.util.* diff --git a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/List.kt b/tangem-core/src/main/java/com/tangem/common/extensions/List.kt similarity index 89% rename from tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/List.kt rename to tangem-core/src/main/java/com/tangem/common/extensions/List.kt index a86c326453..2579809de6 100644 --- a/tangem-sdk/src/main/java/com/tangem/tangem_sdk_new/extensions/List.kt +++ b/tangem-core/src/main/java/com/tangem/common/extensions/List.kt @@ -1,4 +1,4 @@ -package com.tangem.tangem_sdk_new.extensions +package com.tangem.common.extensions fun List.print(delimiter: String = ", ", wrap: Boolean = true): String { val builder = StringBuilder() diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/BaseResponseConverter.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/BaseResponseConverter.kt index 34ead3b362..bf9667298b 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/BaseResponseConverter.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/converter/BaseResponseConverter.kt @@ -1,9 +1,9 @@ package com.tangem.devkit.ucase.variants.responses.converter +import com.tangem.commands.common.ResponseFieldConverter import com.tangem.devkit._arch.structure.Id import com.tangem.devkit._arch.structure.abstraction.* import com.tangem.devkit.ucase.variants.responses.item.TextHeaderItem -import com.tangem.tangem_sdk_new.converter.ResponseFieldConverter import ru.dev.gbixahue.eu4d.lib.kotlin.stringOf /** diff --git a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/ui/ResponseFragment.kt b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/ui/ResponseFragment.kt index ea236daef2..44097bf01f 100644 --- a/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/ui/ResponseFragment.kt +++ b/tangem-devkit/src/main/java/com/tangem/devkit/ucase/variants/responses/ui/ResponseFragment.kt @@ -8,6 +8,7 @@ import androidx.core.os.bundleOf import androidx.fragment.app.activityViewModels import androidx.fragment.app.viewModels import androidx.lifecycle.Observer +import com.tangem.commands.common.ResponseConverter import com.tangem.devkit.R import com.tangem.devkit._arch.widget.WidgetBuilder import com.tangem.devkit._main.MainViewModel @@ -15,7 +16,6 @@ import com.tangem.devkit.extensions.shareText import com.tangem.devkit.ucase.ui.BaseFragment import com.tangem.devkit.ucase.variants.responses.ResponseViewModel import com.tangem.devkit.ucase.variants.responses.ui.widget.ResponseItemBuilder -import com.tangem.tangem_sdk_new.converter.ResponseConverter /** [REDACTED_AUTHOR] diff --git a/tangem-sdk/build.gradle b/tangem-sdk/build.gradle index 9c2742da98..de05139eb5 100644 --- a/tangem-sdk/build.gradle +++ b/tangem-sdk/build.gradle @@ -58,6 +58,4 @@ dependencies { testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.2.0' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' - - implementation 'com.google.code.gson:gson:2.8.6' } \ No newline at end of file