Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
1e96a64fb2
4 changed files with 33 additions and 34 deletions
2
LICENSE
2
LICENSE
|
@ -1,6 +1,6 @@
|
|||
MIT License
|
||||
|
||||
Copyright (c) 2017 AGORISE, LTD.
|
||||
Copyright (c) 2018 AGORISE, LTD.
|
||||
An International Business Company, Cyprus Reg# ΗΕ375959
|
||||
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||
|
|
|
@ -2,10 +2,9 @@ apply plugin: 'com.android.application'
|
|||
|
||||
android {
|
||||
compileSdkVersion 26
|
||||
buildToolsVersion '26.0.2'
|
||||
defaultConfig {
|
||||
applicationId "cy.agorise.crystalwallet"
|
||||
minSdkVersion 19
|
||||
minSdkVersion 21
|
||||
targetSdkVersion 26
|
||||
versionCode 2
|
||||
versionName "0.2t.alpha"
|
||||
|
@ -44,44 +43,44 @@ android {
|
|||
}
|
||||
|
||||
dependencies {
|
||||
compile fileTree(dir: 'libs', include: ['*.jar'])
|
||||
implementation fileTree(dir: 'libs', include: ['*.jar'])
|
||||
//androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
|
||||
androidTestCompile('com.android.support.test.espresso:espresso-core:3.0.1', {
|
||||
androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
|
||||
exclude group: 'com.android.support', module: 'support-annotations'
|
||||
})
|
||||
//testCompile 'com.android.support.test:runner:1.0.1'
|
||||
compile 'com.android.support:appcompat-v7:26.0.2'
|
||||
compile 'com.android.support:support-v4:26.0.2'
|
||||
compile 'com.android.support:design:26.0.2'
|
||||
compile 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||
compile 'android.arch.lifecycle:runtime:1.0.3'
|
||||
compile 'android.arch.lifecycle:extensions:1.0.0'
|
||||
compile 'android.arch.persistence.room:runtime:1.0.0'
|
||||
compile 'android.arch.paging:runtime:1.0.0-alpha3'
|
||||
compile 'com.idescout.sql:sqlscout-server:2.0'
|
||||
compile 'com.google.code.gson:gson:2.8.0'
|
||||
compile 'com.squareup.retrofit2:retrofit:2.2.0'
|
||||
compile 'com.squareup.retrofit2:converter-gson:2.1.0'
|
||||
compile 'org.bitcoinj:bitcoinj-core:0.14.3'
|
||||
compile 'com.neovisionaries:nv-websocket-client:1.30'
|
||||
compile 'org.tukaani:xz:1.6'
|
||||
compile 'com.jakewharton:butterknife:8.8.1'
|
||||
compile 'com.github.bilthon:graphenej:0.4.6'
|
||||
compile 'com.google.zxing:core:3.3.1'
|
||||
compile 'me.dm7.barcodescanner:zxing:1.9.8'
|
||||
implementation 'com.android.support:appcompat-v7:26.1.0'
|
||||
implementation 'com.android.support:support-v4:26.1.0'
|
||||
implementation 'com.android.support:design:26.1.0'
|
||||
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
|
||||
implementation 'android.arch.lifecycle:runtime:1.0.3'
|
||||
implementation 'android.arch.lifecycle:extensions:1.0.0'
|
||||
implementation 'android.arch.persistence.room:runtime:1.0.0'
|
||||
implementation 'android.arch.paging:runtime:1.0.0-alpha3'
|
||||
implementation 'com.idescout.sql:sqlscout-server:2.0'
|
||||
implementation 'com.google.code.gson:gson:2.8.0'
|
||||
implementation 'com.squareup.retrofit2:retrofit:2.2.0'
|
||||
implementation 'com.squareup.retrofit2:converter-gson:2.1.0'
|
||||
implementation 'org.bitcoinj:bitcoinj-core:0.14.3'
|
||||
implementation 'com.neovisionaries:nv-websocket-client:1.30'
|
||||
implementation 'org.tukaani:xz:1.6'
|
||||
implementation 'com.jakewharton:butterknife:8.8.1'
|
||||
implementation 'com.github.bilthon:graphenej:0.4.6'
|
||||
implementation 'com.google.zxing:core:3.3.1'
|
||||
implementation 'me.dm7.barcodescanner:zxing:1.9.8'
|
||||
|
||||
compile 'com.squareup.okhttp3:logging-interceptor:3.5.0'
|
||||
compile 'de.hdodenhof:circleimageview:2.2.0'
|
||||
implementation 'com.squareup.okhttp3:logging-interceptor:3.5.0'
|
||||
implementation 'de.hdodenhof:circleimageview:2.2.0' // TODO check x86_64
|
||||
|
||||
//testCompile 'junit:junit: 4.12'
|
||||
testCompile 'org.mockito:mockito-core:1.10.19'
|
||||
testImplementation 'org.mockito:mockito-core:1.10.19'
|
||||
annotationProcessor 'android.arch.lifecycle:compiler:1.0.0'
|
||||
annotationProcessor 'android.arch.persistence.room:compiler:1.0.0'
|
||||
annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
|
||||
|
||||
compile 'com.squareup.picasso:picasso:2.5.2'
|
||||
implementation 'com.squareup.picasso:picasso:2.5.2'
|
||||
implementation 'com.github.esafirm.android-image-picker:imagepicker:1.11.1'
|
||||
compile 'id.zelory:compressor:2.1.0'
|
||||
compile 'com.vincent.filepicker:MultiTypeFilePicker:1.0.7'
|
||||
compile 'com.andrognito.patternlockview:patternlockview:1.0.0'
|
||||
implementation 'id.zelory:compressor:2.1.0'
|
||||
implementation 'com.vincent.filepicker:MultiTypeFilePicker:1.0.7'
|
||||
implementation 'com.andrognito.patternlockview:patternlockview:1.0.0'
|
||||
}
|
||||
|
|
|
@ -6,7 +6,7 @@ buildscript {
|
|||
google()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.0.1'
|
||||
classpath 'com.android.tools.build:gradle:3.1.2'
|
||||
classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
|
||||
// NOTE: Do not place your application dependencies here; they belong
|
||||
// in the individual module build.gradle files
|
||||
|
|
4
gradle/wrapper/gradle-wrapper.properties
vendored
4
gradle/wrapper/gradle-wrapper.properties
vendored
|
@ -1,6 +1,6 @@
|
|||
#Mon Nov 13 18:37:27 VET 2017
|
||||
#Thu Jun 07 09:09:01 CDT 2018
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
zipStoreBase=GRADLE_USER_HOME
|
||||
zipStorePath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
|
||||
|
|
Loading…
Reference in a new issue