From 57dce3005d74c73c1635c338424e3e66b6abdfc9 Mon Sep 17 00:00:00 2001 From: "husaynhakeem@gmail.com" Date: Sun, 4 Nov 2018 00:21:43 -0700 Subject: [PATCH] Update library dependencies --- .idea/kotlinc.xml | 7 +++++++ .idea/misc.xml | 2 +- .idea/modules.xml | 1 + app/build.gradle | 15 ++++++++------- build.gradle | 6 +++--- facedetector/build.gradle | 15 +++++++++------ .../facedetector/FirebaseFaceDetectorWrapper.kt | 8 ++++---- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 8 files changed, 35 insertions(+), 23 deletions(-) create mode 100644 .idea/kotlinc.xml diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..5806fb3 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 171be90..ad3cd02 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -52,7 +52,7 @@ - + diff --git a/.idea/modules.xml b/.idea/modules.xml index 36c8a0e..f4b4ecb 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -3,6 +3,7 @@ + diff --git a/app/build.gradle b/app/build.gradle index 02c8243..d6eb167 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -3,11 +3,11 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "husaynhakeem.io.facedetectorapp" minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -20,17 +20,18 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.1.1' - implementation 'com.android.support:design:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' // Camera implementation "com.otaliastudios:cameraview:1.5.1" // Android face detector - implementation 'com.github.husaynhakeem:android-face-detector:v1.1' + implementation('com.github.husaynhakeem:android-face-detector:v1.1') { + exclude group: 'com.android.support' + } } apply plugin: 'com.google.gms.google-services' diff --git a/build.gradle b/build.gradle index d08ffe4..05ee80a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,15 +1,15 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.50' + ext.kotlin_version = '1.2.51' repositories { google() jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.1.3' + classpath 'com.android.tools.build:gradle:3.2.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - classpath 'com.google.gms:google-services:4.0.1' + classpath 'com.google.gms:google-services:4.2.0' } } diff --git a/facedetector/build.gradle b/facedetector/build.gradle index 974e4af..778e442 100644 --- a/facedetector/build.gradle +++ b/facedetector/build.gradle @@ -2,10 +2,10 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { minSdkVersion 21 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -24,14 +24,17 @@ android { } dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'com.android.support:appcompat-v7:27.1.1' + implementation 'com.android.support:appcompat-v7:28.0.0' // ML Kit - implementation 'com.google.firebase:firebase-core:16.0.0' - implementation 'com.google.firebase:firebase-ml-vision:16.0.0' + implementation('com.google.firebase:firebase-core:16.0.4') { + exclude group: 'com.android.support' + } + implementation('com.google.firebase:firebase-ml-vision:18.0.1') { + exclude group: 'com.android.support' + } } repositories { diff --git a/facedetector/src/main/java/husaynhakeem/io/facedetector/FirebaseFaceDetectorWrapper.kt b/facedetector/src/main/java/husaynhakeem/io/facedetector/FirebaseFaceDetectorWrapper.kt index e2b321c..5d29cb0 100644 --- a/facedetector/src/main/java/husaynhakeem/io/facedetector/FirebaseFaceDetectorWrapper.kt +++ b/facedetector/src/main/java/husaynhakeem/io/facedetector/FirebaseFaceDetectorWrapper.kt @@ -12,11 +12,11 @@ internal class FirebaseFaceDetectorWrapper { private val faceDetectorOptions: FirebaseVisionFaceDetectorOptions by lazy { FirebaseVisionFaceDetectorOptions.Builder() - .setModeType(FirebaseVisionFaceDetectorOptions.ACCURATE_MODE) - .setLandmarkType(FirebaseVisionFaceDetectorOptions.ALL_LANDMARKS) - .setClassificationType(FirebaseVisionFaceDetectorOptions.NO_CLASSIFICATIONS) + .setPerformanceMode(FirebaseVisionFaceDetectorOptions.ACCURATE) + .setLandmarkMode(FirebaseVisionFaceDetectorOptions.ALL_LANDMARKS) + .setClassificationMode(FirebaseVisionFaceDetectorOptions.NO_CLASSIFICATIONS) .setMinFaceSize(MIN_FACE_SIZE) - .setTrackingEnabled(true) + .enableTracking() .build() } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 13b31e3..a5a4bdf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Thu Jun 21 21:29:11 PDT 2018 +#Sun Nov 04 00:09:06 PDT 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip