From 7fea27ff082375466617113c644807f056966b4b Mon Sep 17 00:00:00 2001 From: Ibrahim Ali Date: Sun, 30 Dec 2018 03:00:02 +0200 Subject: [PATCH] Upgrade gradle's and libs --- app/build.gradle | 10 +++++----- .../main/java/com/googlecreativelab/drawar/DrawAR.java | 7 ++++++- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 ++-- 4 files changed, 14 insertions(+), 9 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 599d044..e5e2e2f 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 27 + compileSdkVersion 28 defaultConfig { applicationId "com.googlecreativelab.drawar" // 24 is the minimum since ARCore only works with 24 and higher. minSdkVersion 24 - targetSdkVersion 27 + targetSdkVersion 28 versionCode 1 versionName "1.0" } @@ -22,8 +22,8 @@ android { dependencies { // ARCore library - implementation 'com.google.ar:core:1.0.0' + implementation 'com.google.ar:core:1.6.0' implementation 'javax.vecmath:vecmath:1.5.2' - implementation 'com.android.support:appcompat-v7:27.1.0' - implementation 'com.android.support:design:27.1.0' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' } diff --git a/app/src/main/java/com/googlecreativelab/drawar/DrawAR.java b/app/src/main/java/com/googlecreativelab/drawar/DrawAR.java index 165620f..bd68558 100755 --- a/app/src/main/java/com/googlecreativelab/drawar/DrawAR.java +++ b/app/src/main/java/com/googlecreativelab/drawar/DrawAR.java @@ -47,6 +47,7 @@ import com.google.ar.core.Frame; import com.google.ar.core.Session; import com.google.ar.core.TrackingState; +import com.google.ar.core.exceptions.CameraNotAvailableException; import com.google.ar.core.exceptions.UnavailableApkTooOldException; import com.google.ar.core.exceptions.UnavailableArcoreNotInstalledException; import com.google.ar.core.exceptions.UnavailableSdkTooOldException; @@ -325,7 +326,11 @@ protected void onResume() { mSession.configure(config); } // Note that order matters - see the note in onPause(), the reverse applies here. - mSession.resume(); + try { + mSession.resume(); + } catch (CameraNotAvailableException e) { + e.printStackTrace(); + } mSurfaceView.onResume(); mDisplayRotationHelper.onResume(); mPaused = false; diff --git a/build.gradle b/build.gradle index be505f0..177cffd 100755 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.0.1' + classpath 'com.android.tools.build:gradle:3.2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index c27a348..13d40c2 100755 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 11 17:45:57 EDT 2017 +#Sun Dec 30 02:44:28 EET 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.10-all.zip