diff --git a/.idea/gradle.xml b/.idea/gradle.xml index dbe604a60c..1dde4f60b5 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -11,7 +11,6 @@ diff --git a/app/build.gradle b/app/build.gradle index 81e51cffcf..7e1262e58b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -47,19 +47,9 @@ dependencies { implementation project(':card-common') implementation project(':card-android') implementation project(':server-android') - 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' -// implementation 'com.github.TangemCash:server-android:0.1.4' - + // implementation 'com.github.TangemCash:card-common:0.1.2' + // implementation 'com.github.TangemCash:card-android:0.1.3' + // implementation 'com.github.TangemCash:server-android:0.1.4' implementation 'androidx.appcompat:appcompat:1.1.0-alpha01' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' @@ -89,4 +79,12 @@ dependencies { implementation 'io.reactivex.rxjava2:rxjava:2.2.0' implementation 'io.reactivex.rxjava2:rxandroid:2.0.2' implementation 'io.reactivex.rxjava2:rxkotlin:2.3.0' + + implementation files('libs/ripple-core-0.0.1.jar') + //4 dependencies for ripple-core TODO: move to module? + 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' } \ No newline at end of file diff --git a/ripple-core-0.0.1/build.gradle b/ripple-core-0.0.1/build.gradle deleted file mode 100644 index ff793da726..0000000000 --- a/ripple-core-0.0.1/build.gradle +++ /dev/null @@ -1,15 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('ripple-core-0.0.1-SNAPSHOT.jar')) - -apply plugin: 'java-library' -apply plugin: 'com.github.dcendents.android-maven' - -dependencies { - 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() -} \ No newline at end of file diff --git a/ripple-core-0.0.1/ripple-core-0.0.1-SNAPSHOT.jar b/ripple-core-0.0.1/ripple-core-0.0.1-SNAPSHOT.jar deleted file mode 100644 index 0600aabbdb..0000000000 Binary files a/ripple-core-0.0.1/ripple-core-0.0.1-SNAPSHOT.jar and /dev/null differ diff --git a/ripple-core/build.gradle b/ripple-core/build.gradle deleted file mode 100644 index 31be8312e1..0000000000 --- a/ripple-core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 0600aabbdb..0000000000 Binary files a/ripple-core/ripple-core-0.0.1-SNAPSHOT.jar and /dev/null differ diff --git a/settings.gradle b/settings.gradle index 7c7add5bef..ac821b1c6c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':card-android', ':server-android', ':card-common', ':ripple-core' +include ':app', ':card-android', ':server-android', ':card-common'