Bumps versions to gradle 4.4 and AGP 3.1.4 (android#11)

sedstrom · Sep 11, 2018 · 3da311c · 3da311c
1 parent 1a1b3fa
commit 3da311c
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 20 deletions.
diff --git a/BasicSample/app/build.gradle b/BasicSample/app/build.gradle
@@ -46,19 +46,18 @@ android {
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
-    implementation 'com.android.support:appcompat-v7:27.0.2'
-    implementation 'com.android.support:support-v4:27.0.2'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.android.support:appcompat-v7:27.1.1'
+    implementation 'com.android.support:support-v4:27.1.1'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
 
     // For ViewModelActivity
-    implementation "android.arch.lifecycle:extensions:1.1.0"
+    implementation "android.arch.lifecycle:extensions:1.1.1"
 
     testImplementation 'junit:junit:4.12'
 
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
-
-    kapt 'com.android.databinding:compiler:3.0.1'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test:rules:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
 
 }
diff --git a/...le/app/src/androidTest/java/com/example/android/databinding/basicsample/BasicUsageTest.kt b/...le/app/src/androidTest/java/com/example/android/databinding/basicsample/BasicUsageTest.kt
@@ -19,7 +19,9 @@ package com.example.android.databinding.basicsample
 import android.support.test.espresso.Espresso.onView
 import android.support.test.espresso.action.ViewActions.click
 import android.support.test.espresso.assertion.ViewAssertions.matches
-import android.support.test.espresso.matcher.ViewMatchers.*
+import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
+import android.support.test.espresso.matcher.ViewMatchers.withId
+import android.support.test.espresso.matcher.ViewMatchers.withText
 import android.support.test.rule.ActivityTestRule
 import android.support.test.runner.AndroidJUnit4
 import com.example.android.databinding.basicsample.ui.MainActivity

diff --git a/...p/src/main/java/com/example/android/databinding/basicsample/ui/ObservableFieldActivity.kt b/...p/src/main/java/com/example/android/databinding/basicsample/ui/ObservableFieldActivity.kt
@@ -26,7 +26,7 @@ import com.example.android.databinding.basicsample.data.ObservableFieldProfile
 import com.example.android.databinding.basicsample.databinding.ObservableFieldProfileBinding
 
 /**
- * This activity shows the same data as [PojoActivity] but it lets the user increment the
+ * This activity shows shows static data and lets the user increment the
  * number of likes by clicking a button. See [ViewModelActivity] for a better implementation.
  */
 class ObservableFieldActivity : AppCompatActivity() {

diff --git a/BasicSample/app/src/main/res/layout/observable_field_profile.xml b/BasicSample/app/src/main/res/layout/observable_field_profile.xml
@@ -32,8 +32,7 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="com.example.android.databinding.basicsample.ui.PojoActivity">
+        android:layout_height="match_parent">
 
         <TextView
             android:id="@+id/name"

diff --git a/BasicSample/app/src/main/res/layout/viewmodel_profile.xml b/BasicSample/app/src/main/res/layout/viewmodel_profile.xml
@@ -29,8 +29,7 @@
 
     <android.support.constraint.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        tools:context="com.example.android.databinding.basicsample.ui.PojoActivity">
+        android:layout_height="match_parent">
 
         <!-- A simple binding between a TextView and a string observable in the ViewModel -->
         <TextView

diff --git a/BasicSample/build.gradle b/BasicSample/build.gradle
@@ -17,13 +17,13 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 
 buildscript {
-    ext.kotlin_version = '1.2.0'
+    ext.kotlin_version = '1.2.50'
     repositories {
         google()
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.0.1'
+        classpath 'com.android.tools.build:gradle:3.1.4'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/BasicSample/gradle/wrapper/gradle-wrapper.properties b/BasicSample/gradle/wrapper/gradle-wrapper.properties
@@ -13,10 +13,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-
-#Tue Dec 19 11:51:19 CET 2017
+#Tue Sep 11 12:55:36 CEST 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