Update dependencies

geckour · Feb 4, 2019 · 90586cd · 90586cd
1 parent 473b6e6
commit 90586cd
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 16 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,17 +26,17 @@ android {
 }
 
 dependencies {
-    def coroutines_version = '1.0.1'
+    def coroutines_version = '1.1.1'
     def stetho_version = '1.5.0'
 
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'com.google.android.material:material:1.1.0-alpha01'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha2'
+    implementation 'com.google.android.material:material:1.1.0-alpha03'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-alpha3'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.1.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    androidTestImplementation 'androidx.test:runner:1.1.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1'
 
     // Coroutines
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version"
@@ -51,7 +51,4 @@ dependencies {
 
     // TensorFlow
     implementation 'org.tensorflow:tensorflow-android:1.12.0'
-
-    // Pinch-enabled ImageView
-    implementation 'com.github.chrisbanes:PhotoView:2.0.0'
 }
diff --git a/app/src/main/res/layout/activity_identify.xml b/app/src/main/res/layout/activity_identify.xml
@@ -264,11 +264,11 @@
             android:layout_marginEnd="4dp"
             android:layout_marginBottom="4dp"
             android:padding="4dp"
-            android:tint="@android:color/white"
             android:src="@{lightEnabled ? @drawable/ic_light_off : @drawable/ic_light_on}"
+            android:tint="@android:color/white"
             app:layout_constraintBottom_toBottomOf="@id/result_4_value"
             app:layout_constraintEnd_toEndOf="@id/result_4_value"
-            tools:src="@drawable/ic_light_on"/>
+            tools:src="@drawable/ic_light_on" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/button_flatten"
@@ -310,7 +310,5 @@
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:tint="@android:color/white" />
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </layout>
diff --git a/build.gradle b/build.gradle
@@ -1,13 +1,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.3.10'
+    ext.kotlin_version = '1.3.20'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'com.android.tools.build:gradle:3.3.0'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon May 14 11:58:46 JST 2018
+#Mon Feb 04 18:29:35 JST 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip