From 80e44ddd6b858d4636fad2fddb8bc323f53b534e Mon Sep 17 00:00:00 2001 From: Andrii Drihulias Date: Thu, 9 Aug 2018 18:05:01 +0300 Subject: [PATCH 1/6] libraries updated --- app/build.gradle | 19 ++++++++----------- .../identitytest/MainActivity.java | 3 +-- build.gradle | 2 +- gradle.properties | 3 +-- 4 files changed, 11 insertions(+), 16 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index d87f028..3fbbc33 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,20 +25,17 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) + implementation fileTree(dir: 'libs', include: ['*.aar']) implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:design:27.1.1' + implementation 'com.android.volley:volley:1.1.1' + implementation 'com.opentok.android:opentok-android-sdk:2.12.0' + implementation('com.microblink:blinkid:3.17.0') + implementation 'io.fotoapparat.fotoapparat:library:2.2.0' - implementation('de.identity:identity:3.0.7') { - transitive = true - } - - implementation('de.identity:networktest:3.0.7') { - transitive = true - } - - implementation('de.identity:ocr:3.0.7') { - transitive = true - } + implementation(group: 'de.identity', name: 'identity', version: '3.0.8', ext: 'aar') + implementation(group: 'de.identity', name: 'networktest', version: '3.0.8', ext: 'aar') + implementation(group: 'de.identity', name: 'ocr', version: '3.0.8', ext: 'aar') } diff --git a/app/src/main/java/io/supercharge/identitytest/MainActivity.java b/app/src/main/java/io/supercharge/identitytest/MainActivity.java index 99f3d8f..03e4d3f 100644 --- a/app/src/main/java/io/supercharge/identitytest/MainActivity.java +++ b/app/src/main/java/io/supercharge/identitytest/MainActivity.java @@ -2,10 +2,8 @@ import android.os.Bundle; import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.Snackbar; import android.support.v7.app.AppCompatActivity; import android.support.v7.widget.Toolbar; -import android.view.View; import android.view.Menu; import android.view.MenuItem; @@ -22,6 +20,7 @@ protected void onCreate(Bundle savedInstanceState) { FloatingActionButton fab = findViewById(R.id.fab); fab.setOnClickListener(view -> IdentityVideoSDK.getInstance().startIdentification(this, 1234, "")); + } @Override diff --git a/build.gradle b/build.gradle index fe4b8ed..8a3dd99 100644 --- a/build.gradle +++ b/build.gradle @@ -19,9 +19,9 @@ allprojects { repositories { google() jcenter() + maven { url 'http://maven.microblink.com' } maven { url "http://tokbox.bintray.com/maven" } maven { url 'https://jitpack.io' } - maven { url 'http://maven.microblink.com' } maven { url "https://identity.jfrog.io/identity/identity-sdk-release-local" credentials { diff --git a/gradle.properties b/gradle.properties index d91ce29..b897cee 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,7 @@ # http://www.gradle.org/docs/current/userguide/build_environment.html # Specifies the JVM arguments used for the daemon process. # The setting is particularly useful for tweaking memory settings. -org.gradle.jvmargs=-Xmx1536m -android.enableD8=false +org.gradle.jvmargs=-Xmx1536m # When configured, Gradle will run in incubating parallel mode. # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects From 2d96b1c74cc5b8477f19bcb84b10e1a1702a9b90 Mon Sep 17 00:00:00 2001 From: Andrii Drihulias Date: Thu, 9 Aug 2018 18:43:59 +0300 Subject: [PATCH 2/6] Update dependency --- app/build.gradle | 11 +++++++++++ build.gradle | 15 +++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index 3fbbc33..7d0740f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -35,6 +35,17 @@ dependencies { implementation('com.microblink:blinkid:3.17.0') implementation 'io.fotoapparat.fotoapparat:library:2.2.0' + compile 'com.google.code.gson:gson:' + rootProject.deps.gsonVersion + compile 'com.squareup.okhttp3:okhttp:' + rootProject.deps.okHttpVersion + compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.deps.okHttpVersion + compile 'com.squareup.retrofit2:retrofit:' + rootProject.deps.retrofitVersion + compile 'com.squareup.retrofit2:converter-gson:' + rootProject.deps.retrofitVersion + compile 'com.squareup.retrofit2:adapter-rxjava2:' + rootProject.deps.retrofitVersion + compile 'io.reactivex.rxjava2:rxjava:' + rootProject.deps.rxJavaVersion + compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.deps.rxAndroidVersion + compile 'com.google.android.gms:play-services-vision:15.0.2' + compile 'com.jakewharton:butterknife:' + rootProject.deps.butterknife + implementation(group: 'de.identity', name: 'identity', version: '3.0.8', ext: 'aar') implementation(group: 'de.identity', name: 'networktest', version: '3.0.8', ext: 'aar') implementation(group: 'de.identity', name: 'ocr', version: '3.0.8', ext: 'aar') diff --git a/build.gradle b/build.gradle index 8a3dd99..cac7c5a 100644 --- a/build.gradle +++ b/build.gradle @@ -14,6 +14,21 @@ buildscript { // in the individual module build.gradle files } } +ext { + deps = [ + supportLibraryVersion: '27.1.1', + volley : '1.1.1', + pusher : '1.5.0', + opentok : '2.12.0', + rxJavaVersion : '2.1.0', + rxAndroidVersion : '2.0.1', + rxBindingVersion : '2.0.0', + retrofitVersion : '2.2.0', + okHttpVersion : '3.7.0', + gsonVersion : '2.8.0', + butterknife : '8.4.0', + ] +} allprojects { repositories { From 15d7e4b98fcc45c735f8465e0c72938e11c71f60 Mon Sep 17 00:00:00 2001 From: Andrii Drihulias Date: Fri, 10 Aug 2018 15:43:54 +0300 Subject: [PATCH 3/6] Small update --- app/build.gradle | 1 + 1 file changed, 1 insertion(+) diff --git a/app/build.gradle b/app/build.gradle index 7d0740f..c007525 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,6 +45,7 @@ dependencies { compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.deps.rxAndroidVersion compile 'com.google.android.gms:play-services-vision:15.0.2' compile 'com.jakewharton:butterknife:' + rootProject.deps.butterknife + compile "com.pusher:pusher-java-client:${rootProject.deps.pusher}" implementation(group: 'de.identity', name: 'identity', version: '3.0.8', ext: 'aar') implementation(group: 'de.identity', name: 'networktest', version: '3.0.8', ext: 'aar') From 7ffd9e4750dae4197896776196d3e274f5a68545 Mon Sep 17 00:00:00 2001 From: Andrii Drihulias Date: Fri, 10 Aug 2018 16:53:39 +0300 Subject: [PATCH 4/6] Added test hash --- app/src/main/java/io/supercharge/identitytest/MainActivity.java | 2 +- .../main/java/io/supercharge/identitytest/TestApplication.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/io/supercharge/identitytest/MainActivity.java b/app/src/main/java/io/supercharge/identitytest/MainActivity.java index 03e4d3f..355f26f 100644 --- a/app/src/main/java/io/supercharge/identitytest/MainActivity.java +++ b/app/src/main/java/io/supercharge/identitytest/MainActivity.java @@ -19,7 +19,7 @@ protected void onCreate(Bundle savedInstanceState) { setSupportActionBar(toolbar); FloatingActionButton fab = findViewById(R.id.fab); - fab.setOnClickListener(view -> IdentityVideoSDK.getInstance().startIdentification(this, 1234, "")); + fab.setOnClickListener(view -> IdentityVideoSDK.getInstance().startIdentification(this, 1234, "zq_sGxyYcg4XvJSjak4x")); } diff --git a/app/src/main/java/io/supercharge/identitytest/TestApplication.java b/app/src/main/java/io/supercharge/identitytest/TestApplication.java index b687785..473af7f 100644 --- a/app/src/main/java/io/supercharge/identitytest/TestApplication.java +++ b/app/src/main/java/io/supercharge/identitytest/TestApplication.java @@ -11,6 +11,6 @@ public void onCreate() { super.onCreate(); IdentityVideoSDK.initialize(this); - IdentityVideoSDK.setMode(IdentityVideoSDK.Mode.TEST); + IdentityVideoSDK.setMode(IdentityVideoSDK.Mode.STAGING); } } From 409a8254ca450d9191b0afc0f3f78cef4cc92e44 Mon Sep 17 00:00:00 2001 From: Andrii Drihulias Date: Mon, 13 Aug 2018 10:38:31 +0300 Subject: [PATCH 5/6] libraries update --- app/build.gradle | 29 ++++++++++------------------- build.gradle | 18 +----------------- 2 files changed, 11 insertions(+), 36 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index c007525..4ec8b3a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,29 +25,20 @@ android { dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation fileTree(dir: 'libs', include: ['*.aar']) implementation 'com.android.support:appcompat-v7:27.1.1' implementation 'com.android.support.constraint:constraint-layout:1.1.2' implementation 'com.android.support:design:27.1.1' - implementation 'com.android.volley:volley:1.1.1' - implementation 'com.opentok.android:opentok-android-sdk:2.12.0' - implementation('com.microblink:blinkid:3.17.0') - implementation 'io.fotoapparat.fotoapparat:library:2.2.0' - compile 'com.google.code.gson:gson:' + rootProject.deps.gsonVersion - compile 'com.squareup.okhttp3:okhttp:' + rootProject.deps.okHttpVersion - compile 'com.squareup.okhttp3:logging-interceptor:' + rootProject.deps.okHttpVersion - compile 'com.squareup.retrofit2:retrofit:' + rootProject.deps.retrofitVersion - compile 'com.squareup.retrofit2:converter-gson:' + rootProject.deps.retrofitVersion - compile 'com.squareup.retrofit2:adapter-rxjava2:' + rootProject.deps.retrofitVersion - compile 'io.reactivex.rxjava2:rxjava:' + rootProject.deps.rxJavaVersion - compile 'io.reactivex.rxjava2:rxandroid:' + rootProject.deps.rxAndroidVersion - compile 'com.google.android.gms:play-services-vision:15.0.2' - compile 'com.jakewharton:butterknife:' + rootProject.deps.butterknife - compile "com.pusher:pusher-java-client:${rootProject.deps.pusher}" + implementation('de.identity:networktest:3.0.8') { + transitive = true + } + implementation('de.identity:identity:3.0.8') { + transitive = true + } + implementation('de.identity:ocr:3.0.8') { + transitive = true + exclude module: "support-v13" + } - implementation(group: 'de.identity', name: 'identity', version: '3.0.8', ext: 'aar') - implementation(group: 'de.identity', name: 'networktest', version: '3.0.8', ext: 'aar') - implementation(group: 'de.identity', name: 'ocr', version: '3.0.8', ext: 'aar') } diff --git a/build.gradle b/build.gradle index cac7c5a..1b9171a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,34 +1,18 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - + repositories { google() jcenter() } dependencies { classpath 'com.android.tools.build:gradle:3.1.3' - // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } } -ext { - deps = [ - supportLibraryVersion: '27.1.1', - volley : '1.1.1', - pusher : '1.5.0', - opentok : '2.12.0', - rxJavaVersion : '2.1.0', - rxAndroidVersion : '2.0.1', - rxBindingVersion : '2.0.0', - retrofitVersion : '2.2.0', - okHttpVersion : '3.7.0', - gsonVersion : '2.8.0', - butterknife : '8.4.0', - ] -} allprojects { repositories { From 6a32e2336f5dafd23845d637e370f25cad72b43a Mon Sep 17 00:00:00 2001 From: Andrii Drihulias Date: Mon, 13 Aug 2018 11:28:29 +0300 Subject: [PATCH 6/6] update dependency --- build.gradle | 3 --- 1 file changed, 3 deletions(-) diff --git a/build.gradle b/build.gradle index 1b9171a..61f1bf0 100644 --- a/build.gradle +++ b/build.gradle @@ -18,9 +18,6 @@ allprojects { repositories { google() jcenter() - maven { url 'http://maven.microblink.com' } - maven { url "http://tokbox.bintray.com/maven" } - maven { url 'https://jitpack.io' } maven { url "https://identity.jfrog.io/identity/identity-sdk-release-local" credentials {