diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 8dd72c7718..53510ed60b 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -12,8 +12,8 @@
-
+
diff --git a/settings.gradle b/settings.gradle
index ee422662a2..708b3b0531 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1 +1 @@
-include ':app', ':tangem-sdk-old', ':server-android', ':tangem-card-old', ':tangem-card', ':tangem-sdk', ':tangemtest'
+include ':app', ':tangem-sdk-old', ':server-android', ':tangem-card-old', ':tangem-core', ':tangem-sdk', ':tangemtest'
diff --git a/tangem-card/.gitignore b/tangem-core/.gitignore
similarity index 100%
rename from tangem-card/.gitignore
rename to tangem-core/.gitignore
diff --git a/tangem-card/build.gradle b/tangem-core/build.gradle
similarity index 98%
rename from tangem-card/build.gradle
rename to tangem-core/build.gradle
index d75871fffa..c6a765cb11 100644
--- a/tangem-card/build.gradle
+++ b/tangem-core/build.gradle
@@ -1,7 +1,7 @@
apply plugin: "kotlin"
group = 'com.github.TangemCash'
-version '0.2.2'
+version '0.1.0'
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
diff --git a/tangem-card/src/main/java/com/tangem/CardEnvironment.kt b/tangem-core/src/main/java/com/tangem/CardEnvironment.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/CardEnvironment.kt
rename to tangem-core/src/main/java/com/tangem/CardEnvironment.kt
diff --git a/tangem-card/src/main/java/com/tangem/CardManager.kt b/tangem-core/src/main/java/com/tangem/CardManager.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/CardManager.kt
rename to tangem-core/src/main/java/com/tangem/CardManager.kt
diff --git a/tangem-card/src/main/java/com/tangem/CardManagerDelegate.kt b/tangem-core/src/main/java/com/tangem/CardManagerDelegate.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/CardManagerDelegate.kt
rename to tangem-core/src/main/java/com/tangem/CardManagerDelegate.kt
diff --git a/tangem-card/src/main/java/com/tangem/CardReader.kt b/tangem-core/src/main/java/com/tangem/CardReader.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/CardReader.kt
rename to tangem-core/src/main/java/com/tangem/CardReader.kt
diff --git a/tangem-card/src/main/java/com/tangem/DataStorage.kt b/tangem-core/src/main/java/com/tangem/DataStorage.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/DataStorage.kt
rename to tangem-core/src/main/java/com/tangem/DataStorage.kt
diff --git a/tangem-card/src/main/java/com/tangem/Log.kt b/tangem-core/src/main/java/com/tangem/Log.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/Log.kt
rename to tangem-core/src/main/java/com/tangem/Log.kt
diff --git a/tangem-card/src/main/java/com/tangem/Response.kt b/tangem-core/src/main/java/com/tangem/Response.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/Response.kt
rename to tangem-core/src/main/java/com/tangem/Response.kt
diff --git a/tangem-card/src/main/java/com/tangem/commands/CheckWalletCommand.kt b/tangem-core/src/main/java/com/tangem/commands/CheckWalletCommand.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/commands/CheckWalletCommand.kt
rename to tangem-core/src/main/java/com/tangem/commands/CheckWalletCommand.kt
diff --git a/tangem-card/src/main/java/com/tangem/commands/CommandSerializer.kt b/tangem-core/src/main/java/com/tangem/commands/CommandSerializer.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/commands/CommandSerializer.kt
rename to tangem-core/src/main/java/com/tangem/commands/CommandSerializer.kt
diff --git a/tangem-card/src/main/java/com/tangem/commands/ReadCardCommand.kt b/tangem-core/src/main/java/com/tangem/commands/ReadCardCommand.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/commands/ReadCardCommand.kt
rename to tangem-core/src/main/java/com/tangem/commands/ReadCardCommand.kt
diff --git a/tangem-card/src/main/java/com/tangem/commands/SignCommand.kt b/tangem-core/src/main/java/com/tangem/commands/SignCommand.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/commands/SignCommand.kt
rename to tangem-core/src/main/java/com/tangem/commands/SignCommand.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/CompletionResult.kt b/tangem-core/src/main/java/com/tangem/common/CompletionResult.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/CompletionResult.kt
rename to tangem-core/src/main/java/com/tangem/common/CompletionResult.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/apdu/CommandApdu.kt b/tangem-core/src/main/java/com/tangem/common/apdu/CommandApdu.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/apdu/CommandApdu.kt
rename to tangem-core/src/main/java/com/tangem/common/apdu/CommandApdu.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/apdu/ResponseApdu.kt b/tangem-core/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
rename to tangem-core/src/main/java/com/tangem/common/apdu/ResponseApdu.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/extentions/ByteArray.kt b/tangem-core/src/main/java/com/tangem/common/extentions/ByteArray.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/extentions/ByteArray.kt
rename to tangem-core/src/main/java/com/tangem/common/extentions/ByteArray.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/extentions/String.kt b/tangem-core/src/main/java/com/tangem/common/extentions/String.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/extentions/String.kt
rename to tangem-core/src/main/java/com/tangem/common/extentions/String.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/tlv/Tlv.kt b/tangem-core/src/main/java/com/tangem/common/tlv/Tlv.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/tlv/Tlv.kt
rename to tangem-core/src/main/java/com/tangem/common/tlv/Tlv.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/tlv/TlvMapper.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvMapper.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/tlv/TlvMapper.kt
rename to tangem-core/src/main/java/com/tangem/common/tlv/TlvMapper.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/tlv/TlvTag.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/tlv/TlvTag.kt
rename to tangem-core/src/main/java/com/tangem/common/tlv/TlvTag.kt
diff --git a/tangem-card/src/main/java/com/tangem/common/tlv/TlvValueType.kt b/tangem-core/src/main/java/com/tangem/common/tlv/TlvValueType.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/common/tlv/TlvValueType.kt
rename to tangem-core/src/main/java/com/tangem/common/tlv/TlvValueType.kt
diff --git a/tangem-card/src/main/java/com/tangem/crypto/CryptoUtils.kt b/tangem-core/src/main/java/com/tangem/crypto/CryptoUtils.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/crypto/CryptoUtils.kt
rename to tangem-core/src/main/java/com/tangem/crypto/CryptoUtils.kt
diff --git a/tangem-card/src/main/java/com/tangem/crypto/Ed25519.kt b/tangem-core/src/main/java/com/tangem/crypto/Ed25519.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/crypto/Ed25519.kt
rename to tangem-core/src/main/java/com/tangem/crypto/Ed25519.kt
diff --git a/tangem-card/src/main/java/com/tangem/crypto/Sepc256k1.kt b/tangem-core/src/main/java/com/tangem/crypto/Sepc256k1.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/crypto/Sepc256k1.kt
rename to tangem-core/src/main/java/com/tangem/crypto/Sepc256k1.kt
diff --git a/tangem-card/src/main/java/com/tangem/data/SettingsMask.kt b/tangem-core/src/main/java/com/tangem/data/SettingsMask.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/data/SettingsMask.kt
rename to tangem-core/src/main/java/com/tangem/data/SettingsMask.kt
diff --git a/tangem-card/src/main/java/com/tangem/enums/Instruction.kt b/tangem-core/src/main/java/com/tangem/enums/Instruction.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/enums/Instruction.kt
rename to tangem-core/src/main/java/com/tangem/enums/Instruction.kt
diff --git a/tangem-card/src/main/java/com/tangem/enums/StatusWord.kt b/tangem-core/src/main/java/com/tangem/enums/StatusWord.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/enums/StatusWord.kt
rename to tangem-core/src/main/java/com/tangem/enums/StatusWord.kt
diff --git a/tangem-card/src/main/java/com/tangem/tasks/ScanTask.kt b/tangem-core/src/main/java/com/tangem/tasks/ScanTask.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tasks/ScanTask.kt
rename to tangem-core/src/main/java/com/tangem/tasks/ScanTask.kt
diff --git a/tangem-card/src/main/java/com/tangem/tasks/SingleCommandTask.kt b/tangem-core/src/main/java/com/tangem/tasks/SingleCommandTask.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tasks/SingleCommandTask.kt
rename to tangem-core/src/main/java/com/tangem/tasks/SingleCommandTask.kt
diff --git a/tangem-card/src/main/java/com/tangem/tasks/Task.kt b/tangem-core/src/main/java/com/tangem/tasks/Task.kt
similarity index 100%
rename from tangem-card/src/main/java/com/tangem/tasks/Task.kt
rename to tangem-core/src/main/java/com/tangem/tasks/Task.kt
diff --git a/tangem-sdk/build.gradle b/tangem-sdk/build.gradle
index 859ce84389..ca1b2e5123 100644
--- a/tangem-sdk/build.gradle
+++ b/tangem-sdk/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-android-extensions'
group = 'com.github.TangemCash'
-version '0.2.2'
+version '0.1.0'
android {
compileSdkVersion 29
@@ -36,7 +36,7 @@ android {
}
dependencies {
- implementation project(':tangem-card')
+ implementation project(':tangem-core')
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.1.0'
diff --git a/tangemtest/build.gradle b/tangemtest/build.gradle
index b815e777ea..d67d457b53 100644
--- a/tangemtest/build.gradle
+++ b/tangemtest/build.gradle
@@ -32,7 +32,7 @@ android {
}
dependencies {
- implementation project(':tangem-card')
+ implementation project(':tangem-core')
implementation project(':tangem-sdk')
implementation fileTree(dir: 'libs', include: ['*.jar'])