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

Enable Databinding using buildfeatures block #321

Merged
merged 7 commits into from
Aug 17, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Update Gradle scripts
Update Kotlin version to 1.3.72
Update Android Gradle plugin version to 4.0.1
Update Gradle version to 6.1.1
SDK version to 30
Enable 'android.useAndroidX' property
Updated library versions
  • Loading branch information
android-dev-lxl committed Aug 12, 2020
commit 855cdd9d20a9fd1dd84651bc8440ef2f471af8da
10 changes: 5 additions & 5 deletions GuessTheWordLiveData/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: "androidx.navigation.safeargs"

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "com.example.android.guesstheword"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -45,18 +45,18 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'

// KTX
implementation 'androidx.core:core-ktx:1.0.1'
implementation 'androidx.core:core-ktx:1.3.1'

// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:1.0.0"
implementation "android.arch.navigation:navigation-ui-ktx:1.0.0"

//ViewModel and LiveData
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
}
4 changes: 2 additions & 2 deletions GuessTheWordLiveData/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.30'
ext.kotlin_version = '1.3.72'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"

Expand Down
4 changes: 2 additions & 2 deletions GuessTheWordLiveData/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 25 11:45:20 PDT 2019
#Tue Aug 11 17:39:48 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
10 changes: 5 additions & 5 deletions GuessTheWordTransformation/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: "androidx.navigation.safeargs"

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "com.example.android.guesstheword"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -45,18 +45,18 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'

// KTX
implementation 'androidx.core:core-ktx:1.0.1'
implementation 'androidx.core:core-ktx:1.3.1'

// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:1.0.0"
implementation "android.arch.navigation:navigation-ui-ktx:1.0.0"

//ViewModel and LiveData
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
}
4 changes: 2 additions & 2 deletions GuessTheWordTransformation/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.30'
ext.kotlin_version = '1.3.72'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 25 11:49:54 PDT 2019
#Tue Aug 11 17:50:04 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
10 changes: 5 additions & 5 deletions GuessTheWordViewModel/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ apply plugin: 'kotlin-android-extensions'
apply plugin: "androidx.navigation.safeargs"

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "com.example.android.guesstheword"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -45,18 +45,18 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
implementation 'androidx.appcompat:appcompat:1.0.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
testImplementation 'junit:junit:4.12'

// KTX
implementation 'androidx.core:core-ktx:1.0.1'
implementation 'androidx.core:core-ktx:1.3.1'

// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:1.0.0"
implementation "android.arch.navigation:navigation-ui-ktx:1.0.0"

//ViewModel
implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
}
4 changes: 2 additions & 2 deletions GuessTheWordViewModel/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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.3.21'
ext.kotlin_version = '1.3.72'
repositories {
google()
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.4.0'
classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath "android.arch.navigation:navigation-safe-args-gradle-plugin:1.0.0"

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Thu Apr 25 11:57:55 PDT 2019
#Wed Aug 12 09:42:38 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
4 changes: 2 additions & 2 deletions MarsRealEstateFinal/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ apply plugin: 'kotlin-kapt'
apply plugin: "androidx.navigation.safeargs"

android {
compileSdkVersion 28
compileSdkVersion 30
dataBinding {
enabled = true
}
defaultConfig {
applicationId "com.example.android.marsrealestate"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand Down
16 changes: 8 additions & 8 deletions MarsRealEstateFinal/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@ buildscript {
// Versions for all the dependencies we plan to use. It's particularly useful for kotlin and
// navigation where the versions of the plugin needs to be the same as the version of the
// library defined in the app Gradle file
version_android_gradle_plugin = "3.3.2"
version_core = "1.0.1"
version_android_gradle_plugin = '4.0.1'
version_core = "1.5.0-alpha01"
version_constraint_layout = "1.1.3"
version_glide = "4.8.0"
version_kotlin = "1.3.21"
version_kotlin_coroutines = "1.1.0"
version_lifecycle_extensions = "2.0.0"
version_moshi = "1.8.0"
version_kotlin = "1.3.72"
version_kotlin_coroutines = "1.3.7"
version_lifecycle_extensions = "2.2.0"
version_moshi = "1.9.3"
version_navigation = "1.0.0"
version_retrofit = "2.5.0"
version_retrofit = "2.9.0"
version_retrofit_coroutines_adapter = "0.9.2"
version_recyclerview = "1.0.0"
version_recyclerview = "1.1.0"
}

repositories {
Expand Down
22 changes: 3 additions & 19 deletions MarsRealEstateFinal/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,23 +1,7 @@
#
# Copyright 2019, The Android Open Source Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
#

#Tue Dec 18 16:00:56 PST 2018
#Wed Aug 12 09:46:14 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
android.databinding.enableV2=true
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip
android.databinding.enableV2=true
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
19 changes: 7 additions & 12 deletions RecyclerViewClickHandler/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'androidx.navigation.safeargs'

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "com.example.android.trackmysleepqualityrecyclerview"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -51,18 +51,18 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// Support libraries
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "androidx.fragment:fragment:1.0.0"
implementation "androidx.constraintlayout:constraintlayout:2.0.0-alpha2"
implementation "androidx.appcompat:appcompat:1.2.0"
implementation "androidx.fragment:fragment:1.2.5"
implementation "androidx.constraintlayout:constraintlayout:2.0.0-rc1"

// Android KTX
implementation 'androidx.core:core-ktx:1.0.1'
implementation 'androidx.core:core-ktx:1.3.1'

// Room and Lifecycle dependencies
implementation "androidx.room:room-runtime:$room_version"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"

// Coroutines
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
Expand All @@ -71,10 +71,5 @@ dependencies {
// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:$navigationVersion"
implementation "android.arch.navigation:navigation-ui-ktx:$navigationVersion"

// Testing
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
}

8 changes: 4 additions & 4 deletions RecyclerViewClickHandler/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
buildscript {

ext {
kotlin_version = '1.3.10'
kotlin_version = '1.3.72'
archLifecycleVersion = '1.1.1'
room_version = '2.0.0'
coroutine_version = '1.0.0'
gradleVersion = '3.4.0'
room_version = '2.2.0'
coroutine_version = '1.3.7'
gradleVersion = '4.0.1'
navigationVersion = '1.0.0-alpha07'
dataBindingCompilerVersion = gradleVersion // Always need to be the same.
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue May 14 17:22:57 PDT 2019
#Wed Aug 12 12:08:56 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
19 changes: 7 additions & 12 deletions RecyclerViewDiffUtilDataBinding/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -21,11 +21,11 @@ apply plugin: 'kotlin-kapt'
apply plugin: 'androidx.navigation.safeargs'

android {
compileSdkVersion 28
compileSdkVersion 30
defaultConfig {
applicationId "com.example.android.trackmysleepqualityrecyclerview"
minSdkVersion 19
targetSdkVersion 28
targetSdkVersion 30
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
Expand All @@ -51,18 +51,18 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

// Support libraries
implementation "androidx.appcompat:appcompat:1.0.0"
implementation "androidx.fragment:fragment:1.0.0"
implementation "androidx.constraintlayout:constraintlayout:2.0.0-alpha2"
implementation "androidx.appcompat:appcompat:1.2.0"
implementation "androidx.fragment:fragment:1.2.5"
implementation "androidx.constraintlayout:constraintlayout:2.0.0-rc1"

// Android KTX
implementation 'androidx.core:core-ktx:1.0.1'
implementation 'androidx.core:core-ktx:1.3.1'

// Room and Lifecycle dependencies
implementation "androidx.room:room-runtime:$room_version"
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.lifecycle:lifecycle-extensions:2.0.0"
implementation "androidx.lifecycle:lifecycle-extensions:2.2.0"

// Coroutines
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutine_version"
Expand All @@ -71,10 +71,5 @@ dependencies {
// Navigation
implementation "android.arch.navigation:navigation-fragment-ktx:$navigationVersion"
implementation "android.arch.navigation:navigation-ui-ktx:$navigationVersion"

// Testing
testImplementation 'junit:junit:4.12'
androidTestImplementation 'androidx.test:runner:1.1.0-alpha4'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4'
}

6 changes: 3 additions & 3 deletions RecyclerViewDiffUtilDataBinding/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@
buildscript {

ext {
kotlin_version = '1.3.10'
kotlin_version = '1.3.72'
archLifecycleVersion = '1.1.1'
room_version = '2.0.0'
coroutine_version = '1.0.0'
gradleVersion = '3.4.0'
coroutine_version = '1.3.7'
gradleVersion = '4.0.1'
navigationVersion = '1.0.0-alpha07'
dataBindingCompilerVersion = gradleVersion // Always need to be the same.
}
Expand Down
Loading