From e806c990ff825745ff49aacee713188fe5484b13 Mon Sep 17 00:00:00 2001 From: GME Date: Sun, 18 Nov 2018 10:01:38 +0100 Subject: [PATCH] clean --- .idea/caches/build_file_checksums.ser | Bin 535 -> 535 bytes app/build.gradle | 39 ++++++------------ .../monnethic/mobile/test/LearningTest.java | 10 ----- app/src/main/AndroidManifest.xml | 2 - .../main/res/layout/activity_demo_wallet.xml | 1 - app/src/main/res/layout/activity_login.xml | 1 - .../res/layout/activity_qr_code_scanner.xml | 1 - .../main/res/layout/activity_transaction.xml | 1 - .../mobile/test/user/UserDaoTest.java | 4 -- 9 files changed, 12 insertions(+), 47 deletions(-) diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser index c7b8f2e6aec3a8189b14bb2f051760da94901554..a39985af31bf5604fd52cefda571672295a8b4f9 100644 GIT binary patch delta 35 tcmV+;0NnqV1eXMmm;{lZos*HAcMv#rvO0qed+_h((L;oL6DE@*0rVJK57z(y delta 35 tcmV+;0NnqV1eXMmm;{j7IlhsccM$kuw*uox+m_e+8fvn=@Gp}i0rW3j5w!pS diff --git a/app/build.gradle b/app/build.gradle index d69538f..faf6245 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.android.application' android { compileSdkVersion 26 defaultConfig { - applicationId "com.example.monnthic.monnthicmobile" + applicationId 'com.monnethic.appmobile' multiDexEnabled true minSdkVersion 19 targetSdkVersion 26 @@ -21,38 +21,23 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } - packagingOptions { - exclude 'META-INF/INDEX.LIST' - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/io.netty.versions.properties' + buildToolsVersion '28.0.3' + productFlavors { } } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(include: ['*.jar'], dir: 'libs') implementation 'com.android.support:appcompat-v7:26.1.0' - implementation 'com.android.support:design:26.1.0' - implementation 'com.android.support:multidex:1.0.3' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - //implementation 'org.glassfish:javax.json:1.0.4' - implementation 'com.google.code.gson:gson:2.8.5' - implementation ('org.hyperledger.fabric-sdk-java:fabric-sdk-java:1.0.0'){ - //exclude group:'org.glassfish', module:'javax.json' - exclude group:'log4j', module:'log4j' - exclude group:'org.jacoco', module:"jacoco-maven-plugin" - } testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.1' - androidTestImplementation 'com.android.support.test:rules:1.0.1' - androidTestImplementation 'com.android.support:support-annotations:26.1.0' - androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', { - exclude group: 'com.android.support', module: 'support-annotations' - }) - implementation 'com.j256.ormlite:ormlite-core:5.1' - implementation 'com.j256.ormlite:ormlite-jdbc:5.1' - implementation group: 'org.postgresql', name: 'postgresql', version: '42.2.5' + implementation 'com.android.support.constraint:constraint-layout:1.1.3' + androidTestImplementation 'com.android.support.test:runner:1.0.2' + androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation 'com.google.code.gson:gson:2.8.5' implementation 'com.google.zxing:core:3.2.1' implementation 'com.journeyapps:zxing-android-embedded:3.2.0@aar' - implementation 'com.google.android.gms:play-services-vision:11.8.0' - implementation group: 'com.madgag.spongycastle', name: 'core', version: '1.54.0.0' + implementation 'com.google.android.gms:play-services-vision:17.0.2' + implementation 'com.j256.ormlite:ormlite-core:5.1' + implementation 'com.j256.ormlite:ormlite-jdbc:5.1' + implementation 'org.postgresql:postgresql:42.2.5' } diff --git a/app/src/androidTest/java/monnethic/mobile/test/LearningTest.java b/app/src/androidTest/java/monnethic/mobile/test/LearningTest.java index 0b86eba..e700131 100644 --- a/app/src/androidTest/java/monnethic/mobile/test/LearningTest.java +++ b/app/src/androidTest/java/monnethic/mobile/test/LearningTest.java @@ -5,19 +5,9 @@ import android.support.test.InstrumentationRegistry; import com.example.monnthic.monnethicmobile.R; -import org.json.JSONObject; import org.junit.Test; - -import java.io.BufferedReader; import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.io.StringWriter; -import java.io.Writer; -import javax.json.Json; -import javax.json.JsonObject; -import javax.json.JsonReader; diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4f61d86..31e5f56 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -7,8 +7,6 @@ - - diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml index b254886..e7c2bae 100644 --- a/app/src/main/res/layout/activity_login.xml +++ b/app/src/main/res/layout/activity_login.xml @@ -1,6 +1,5 @@ diff --git a/app/src/main/res/layout/activity_qr_code_scanner.xml b/app/src/main/res/layout/activity_qr_code_scanner.xml index e08f9c2..f049470 100644 --- a/app/src/main/res/layout/activity_qr_code_scanner.xml +++ b/app/src/main/res/layout/activity_qr_code_scanner.xml @@ -1,6 +1,5 @@ diff --git a/app/src/test/java/monnethic/mobile/test/user/UserDaoTest.java b/app/src/test/java/monnethic/mobile/test/user/UserDaoTest.java index 1471e4e..630ed4a 100644 --- a/app/src/test/java/monnethic/mobile/test/user/UserDaoTest.java +++ b/app/src/test/java/monnethic/mobile/test/user/UserDaoTest.java @@ -3,15 +3,11 @@ package monnethic.mobile.test.user; import com.j256.ormlite.dao.Dao; import com.j256.ormlite.table.TableUtils; -import org.junit.FixMethodOrder; import org.junit.Test; -import org.junit.runners.MethodSorters; - import java.sql.Timestamp; import monnethic.mobile.user.User; import monnethic.mobile.user.UserDao; -@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class UserDaoTest { private UserDao udao = new UserDao(); private final String USER_EMAIL = "thomas.marshal@gmail.com";