diff --git a/.idea/gradle.xml b/.idea/gradle.xml index da117a274a..dbe604a60c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,7 +11,7 @@ diff --git a/app/build.gradle b/app/build.gradle index dff789a723..81e51cffcf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,7 +47,14 @@ dependencies { implementation project(':card-common') implementation project(':card-android') implementation project(':server-android') - implementation project(':ripple-core-0.0.1') + implementation project(':ripple-core') + + //for ripple-core TODO: move to ripple-core? + implementation 'net.i2p.crypto:eddsa:0.2.0' + implementation 'org.bouncycastle:bcprov-jdk15on:1.58' + //noinspection DuplicatePlatformClasses + implementation 'org.json:json:20171018' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.3' // implementation 'com.github.TangemCash:card-common:0.1.2' // implementation 'com.github.TangemCash:card-android:0.1.3' diff --git a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java b/app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java index 1d202c922f..449d755e65 100644 --- a/app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java +++ b/app/src/main/java/com/tangem/domain/wallet/xrp/XrpPayment.java @@ -1,5 +1,6 @@ package com.tangem.domain.wallet.xrp; + import com.ripple.core.types.known.tx.txns.Payment; public class XrpPayment extends Payment { diff --git a/ripple-core-0.0.1/build.gradle b/ripple-core-0.0.1/build.gradle index 7ee498ed2c..ff793da726 100644 --- a/ripple-core-0.0.1/build.gradle +++ b/ripple-core-0.0.1/build.gradle @@ -1,52 +1,15 @@ -apply plugin: 'java' -apply plugin: 'kotlin' +configurations.maybeCreate("default") +artifacts.add("default", file('ripple-core-0.0.1-SNAPSHOT.jar')) -description = 'ripple-core' - -version = '0.0.1-SNAPSHOT' - -sourceCompatibility = 1.8 -targetCompatibility = 1.8 +apply plugin: 'java-library' +apply plugin: 'com.github.dcendents.android-maven' dependencies { - compile 'net.i2p.crypto:eddsa:0.2.0' - compile 'org.bouncycastle:bcprov-jdk15on:1.58' - compile 'org.json:json:20171018' - compile 'com.fasterxml.jackson.core:jackson-databind:2.9.3' - testCompile 'junit:junit:4.12' - testCompile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" - testCompile "org.jetbrains.kotlinx:kotlinx-coroutines-core:0.22.5" -} -buildscript { - ext.kotlin_version = '1.3.0' - repositories { - mavenCentral() - } - dependencies { - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - } + implementation 'net.i2p.crypto:eddsa:0.2.0' + implementation 'org.bouncycastle:bcprov-jdk15on:1.58' + implementation 'org.json:json:20171018' + implementation 'com.fasterxml.jackson.core:jackson-databind:2.9.3' } repositories { mavenCentral() -} -compileKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} -compileTestKotlin { - kotlinOptions { - jvmTarget = "1.8" - } -} - -task getDeps(type: Copy) { - from configurations.compile - into "$rootDir/jars/" -} - -kotlin { - experimental { - coroutines "enable" - } } \ No newline at end of file diff --git a/ripple-core/build.gradle b/ripple-core/build.gradle new file mode 100644 index 0000000000..31be8312e1 --- /dev/null +++ b/ripple-core/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('ripple-core-0.0.1-SNAPSHOT.jar')) \ No newline at end of file diff --git a/ripple-core/ripple-core-0.0.1-SNAPSHOT.jar b/ripple-core/ripple-core-0.0.1-SNAPSHOT.jar new file mode 100644 index 0000000000..0600aabbdb Binary files /dev/null and b/ripple-core/ripple-core-0.0.1-SNAPSHOT.jar differ diff --git a/settings.gradle b/settings.gradle index 27d8397e5d..7c7add5bef 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':card-android', ':server-android', ':card-common', ':ripple-core-0.0.1' +include ':app', ':card-android', ':server-android', ':card-common', ':ripple-core'