Skip to content

Commit

Permalink
Refactor android client to use wallet libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
ptzianos committed Nov 17, 2019
1 parent f0528f7 commit 4f9ebc6
Show file tree
Hide file tree
Showing 33 changed files with 39 additions and 4,954 deletions.
42 changes: 2 additions & 40 deletions android-client/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,6 @@ android {
lintOptions {
abortOnError false
}
kotlinOptions {
jvmTarget = '1.8'
}
defaultConfig {
applicationId "org.hermes"
minSdkVersion 24
Expand Down Expand Up @@ -56,44 +53,9 @@ android {
}
}

//task buildJnis(type: Exec) {
// def res = commandLine '/bin/bash', '-c',
// 'git submodule update --init --recursive && ' +
// 'cd ../../entangled && ' +
// 'git status | head -n 1 | sed \'s/On branch //\''
//
//// For the time being we just use the commit that the submodule is pointed to
//// we are not going to be updating the repo every time we build the JNI libs.
//// if (res.toString() != 'develop') {
//// println 'Not in develop branch'
//// commandLine '/bin/bash', '-c', 'cd ../../entangled && git reset --hard && git checkout develop'
//// }
// Properties properties = new Properties()
// properties.load(project.rootProject.file('local.properties').newDataInputStream())
// def sdkDir = properties.getProperty('sdk.dir', '')
// def ndkDir = properties.getProperty('ndk.dir', '')
// def cpu_archs = 'armeabi-v7a,arm64-v8a,x86,x86_64'
// def bazel_env_vars = "ANDROID_HOME=${sdkDir} ANDROID_NDK_HOME=${ndkDir}"
//
// println """
//=============================
//
//Android SDK Path: ${sdkDir}
//Android NDK Path: ${ndkDir}
//entangled repository is on branch: ${res.toString()}
//
//=============================
//"""
//
// commandLine '/bin/bash', '-c', 'cd ../../entangled && ' +
// "${bazel_env_vars} bazel build --fat_apk_cpu='${cpu_archs}' --copt=-Ofast //mobile/android:dummy && " +
// 'rm -rf ../android-client/build/jni &&' +
// 'echo A | unzip bazel-bin/mobile/android/dummy.apk -d ../android-client/build/jni && ' +
// 'cp -r ../android-client/build/jni/lib/ ../android-client/app/src/main/jniLibs'
//}

dependencies {
// TODO: Split all the version numbers into the android-client/build.gradle
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.1.0'
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
Expand Down Expand Up @@ -124,7 +86,7 @@ dependencies {
kapt 'com.google.dagger:dagger-android-support:2.22.1'
kapt 'com.google.dagger:dagger-android-processor:2.22.1'
kapt 'com.google.dagger:dagger-compiler:2.22.1'
max23Api files('libs/jota-android-legacy-1.0.0-beta5.jar')
// max23Api files('libs/jota-android-legacy-1.0.0-beta5.jar')
min24Api 'com.github.iotaledger:iota-java:1.0.0-beta5'
testImplementation 'androidx.arch.core:core-testing:2.1.0'
testImplementation 'androidx.test.espresso:espresso-core:3.2.0'
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ package org.hermes
enum class StorageBackend (val network: String) {
IOTA("IOTA"),
STORJ("STORJ"),
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package org.hermes.activities

Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
package org.hermes.activities

44 changes: 0 additions & 44 deletions android-client/app/src/main/java/org/hermes/collections/set.kt

This file was deleted.

This file was deleted.

146 changes: 0 additions & 146 deletions android-client/app/src/main/java/org/hermes/crypto/SecP256K1PrivKey.kt

This file was deleted.

Loading

0 comments on commit 4f9ebc6

Please sign in to comment.