Skip to content
This repository was archived by the owner on Jul 10, 2025. It is now read-only.

Commit 3da311c

Browse files
JoseAlcerrecaJoseAlcerreca
authored
Bumps versions to gradle 4.4 and AGP 3.1.4 (#11)
1 parent 1a1b3fa commit 3da311c

7 files changed

Lines changed: 18 additions & 20 deletions

File tree

‎BasicSample/app/build.gradle‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,18 @@ android {
4646

4747
dependencies {
4848
implementation fileTree(dir: 'libs', include: ['*.jar'])
49-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
50-
implementation 'com.android.support:appcompat-v7:27.0.2'
51-
implementation 'com.android.support:support-v4:27.0.2'
52-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
49+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
50+
implementation 'com.android.support:appcompat-v7:27.1.1'
51+
implementation 'com.android.support:support-v4:27.1.1'
52+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
5353

5454
// For ViewModelActivity
55-
implementation "android.arch.lifecycle:extensions:1.1.0"
55+
implementation "android.arch.lifecycle:extensions:1.1.1"
5656

5757
testImplementation 'junit:junit:4.12'
5858

59-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
60-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
61-
62-
kapt 'com.android.databinding:compiler:3.0.1'
59+
androidTestImplementation 'com.android.support.test:runner:1.0.2'
60+
androidTestImplementation 'com.android.support.test:rules:1.0.2'
61+
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
6362

6463
}

‎BasicSample/app/src/androidTest/java/com/example/android/databinding/basicsample/BasicUsageTest.kt‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ package com.example.android.databinding.basicsample
1919
import android.support.test.espresso.Espresso.onView
2020
import android.support.test.espresso.action.ViewActions.click
2121
import android.support.test.espresso.assertion.ViewAssertions.matches
22-
import android.support.test.espresso.matcher.ViewMatchers.*
22+
import android.support.test.espresso.matcher.ViewMatchers.isDisplayed
23+
import android.support.test.espresso.matcher.ViewMatchers.withId
24+
import android.support.test.espresso.matcher.ViewMatchers.withText
2325
import android.support.test.rule.ActivityTestRule
2426
import android.support.test.runner.AndroidJUnit4
2527
import com.example.android.databinding.basicsample.ui.MainActivity

‎BasicSample/app/src/main/java/com/example/android/databinding/basicsample/ui/ObservableFieldActivity.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ import com.example.android.databinding.basicsample.data.ObservableFieldProfile
2626
import com.example.android.databinding.basicsample.databinding.ObservableFieldProfileBinding
2727

2828
/**
29-
* This activity shows the same data as [PojoActivity] but it lets the user increment the
29+
* This activity shows shows static data and lets the user increment the
3030
* number of likes by clicking a button. See [ViewModelActivity] for a better implementation.
3131
*/
3232
class ObservableFieldActivity : AppCompatActivity() {

‎BasicSample/app/src/main/res/layout/observable_field_profile.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@
3232

3333
<android.support.constraint.ConstraintLayout
3434
android:layout_width="match_parent"
35-
android:layout_height="match_parent"
36-
tools:context="com.example.android.databinding.basicsample.ui.PojoActivity">
35+
android:layout_height="match_parent">
3736

3837
<TextView
3938
android:id="@+id/name"

‎BasicSample/app/src/main/res/layout/viewmodel_profile.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@
2929

3030
<android.support.constraint.ConstraintLayout
3131
android:layout_width="match_parent"
32-
android:layout_height="match_parent"
33-
tools:context="com.example.android.databinding.basicsample.ui.PojoActivity">
32+
android:layout_height="match_parent">
3433

3534
<!-- A simple binding between a TextView and a string observable in the ViewModel -->
3635
<TextView

‎BasicSample/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@
1717
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1818

1919
buildscript {
20-
ext.kotlin_version = '1.2.0'
20+
ext.kotlin_version = '1.2.50'
2121
repositories {
2222
google()
2323
jcenter()
2424
}
2525
dependencies {
26-
classpath 'com.android.tools.build:gradle:3.0.1'
26+
classpath 'com.android.tools.build:gradle:3.1.4'
2727
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
2828

2929
// NOTE: Do not place your application dependencies here; they belong

‎BasicSample/gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,9 @@
1313
# See the License for the specific language governing permissions and
1414
# limitations under the License.
1515
#
16-
17-
#Tue Dec 19 11:51:19 CET 2017
16+
#Tue Sep 11 12:55:36 CEST 2018
1817
distributionBase=GRADLE_USER_HOME
1918
distributionPath=wrapper/dists
2019
zipStoreBase=GRADLE_USER_HOME
2120
zipStorePath=wrapper/dists
22-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
21+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip

0 commit comments

Comments
 (0)