Update Gradle and libraries version in sample applications (#32)

idzkowski-google · web-flow · commit c980965c35bf · 2020-11-09T13:33:05.000-08:00
diff --git a/Camera2Sample/app/build.gradle b/Camera2Sample/app/build.gradle
@@ -32,5 +32,5 @@ dependencies {
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
 
     implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 }
diff --git a/Camera2Sample/build.gradle b/Camera2Sample/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/Camera2Sample/gradle/wrapper/gradle-wrapper.properties b/Camera2Sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:20:07 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/CardSample/app/build.gradle b/CardSample/app/build.gradle
@@ -25,14 +25,15 @@ android {
         versionCode 1
         versionName "1.0"
     }
-    dataBinding {
-        enabled = true
+
+    buildFeatures {
+        dataBinding = true
     }
 }
 
 dependencies {
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.2.1'
 }
diff --git a/CardSample/build.gradle b/CardSample/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/CardSample/gradle/wrapper/gradle-wrapper.properties b/CardSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:22:39 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/GallerySample/app/build.gradle b/GallerySample/app/build.gradle
@@ -31,14 +31,14 @@ android {
             minifyEnabled false
         }
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
 }
 
 dependencies {
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
     implementation 'com.android.support:appcompat-v7:28.0.0'
     implementation 'com.android.support:recyclerview-v7:28.0.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
 }
diff --git a/GallerySample/build.gradle b/GallerySample/build.gradle
@@ -20,7 +20,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/GallerySample/gradle/wrapper/gradle-wrapper.properties b/GallerySample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:29:58 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/GestureLibrarySample/build.gradle b/GestureLibrarySample/build.gradle
@@ -22,7 +22,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/GestureLibrarySample/gradle/wrapper/gradle-wrapper.properties b/GestureLibrarySample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:15:09 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/NotesSample/app/build.gradle b/NotesSample/app/build.gradle
@@ -33,8 +33,8 @@ android {
         versionName "1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
-    dataBinding {
-        enabled = true
+    buildFeatures {
+        dataBinding = true
     }
     kotlinOptions {
         jvmTarget = JavaVersion.VERSION_1_8.toString()
@@ -45,14 +45,14 @@ dependencies {
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
 
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation "androidx.fragment:fragment-ktx:1.2.4"
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
-    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-alpha03'
+    implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-beta01'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'com.google.android.material:material:1.2.1'
 
     // Room persistence library imports
     implementation "androidx.room:room-runtime:$room_version"
diff --git a/NotesSample/build.gradle b/NotesSample/build.gradle
@@ -15,15 +15,15 @@
  */
 
 buildscript {
-    ext.kotlin_version = '1.3.41'
+    ext.kotlin_version = '1.3.72'
     ext.room_version = '2.2.5'
     repositories {
         google()
         jcenter()
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/QRCodeScannerSample/app/build.gradle b/QRCodeScannerSample/app/build.gradle
@@ -39,9 +39,9 @@ android {
 dependencies {
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
 
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.camera:camera-core:1.0.0-alpha06'
     implementation 'androidx.camera:camera-camera2:1.0.0-alpha06'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.google.zxing:core:3.2.1'
 }
diff --git a/QRCodeScannerSample/build.gradle b/QRCodeScannerSample/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/QRCodeScannerSample/gradle/wrapper/gradle-wrapper.properties b/QRCodeScannerSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:14:14 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/VoiceRecognitionSample/app/build.gradle b/VoiceRecognitionSample/app/build.gradle
@@ -31,6 +31,6 @@ android {
 dependencies {
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
 
-    implementation 'androidx.appcompat:appcompat:1.0.2'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
 }
diff --git a/VoiceRecognitionSample/build.gradle b/VoiceRecognitionSample/build.gradle
@@ -21,7 +21,7 @@ buildscript {
         
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
         
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/VoiceRecognitionSample/gradle/wrapper/gradle-wrapper.properties b/VoiceRecognitionSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:41:19 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip
diff --git a/WebRTCSample/app/build.gradle b/WebRTCSample/app/build.gradle
@@ -44,11 +44,11 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation fileTree(dir: 'third_party/autobanh/lib', include: ['autobanh.jar'])
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'
     implementation 'com.google.code.findbugs:jsr305:3.0.2'
     implementation 'org.webrtc:google-webrtc:1.0.30039'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.7'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'com.android.support.test:runner:1.0.2'
diff --git a/WebRTCSample/build.gradle b/WebRTCSample/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.0'
+        classpath 'com.android.tools.build:gradle:4.0.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/WebRTCSample/gradle/wrapper/gradle-wrapper.properties b/WebRTCSample/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
+#Mon Nov 09 10:43:19 PST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip

Original file line number	Diff line number	Diff line change
`@@ -32,5 +32,5 @@ dependencies {`
`32`	`32`	`implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'`
`33`	`33`
`34`	`34`	`implementation 'com.android.support:appcompat-v7:28.0.0'`
`35`		`- implementation 'com.android.support.constraint:constraint-layout:1.1.3'`
	`35`	`+ implementation 'com.android.support.constraint:constraint-layout:2.0.4'`
`36`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ buildscript {`
`20`	`20`	`jcenter()`
`21`	`21`	`}`
`22`	`22`	`dependencies {`
`23`		`- classpath 'com.android.tools.build:gradle:4.0.0'`
	`23`	`+ classpath 'com.android.tools.build:gradle:4.0.2'`
`24`	`24`
`25`	`25`	`// NOTE: Do not place your application dependencies here; they belong`
`26`	`26`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,15 @@ android {`
`25`	`25`	`versionCode 1`
`26`	`26`	`versionName "1.0"`
`27`	`27`	`}`
`28`		`- dataBinding {`
`29`		`- enabled = true`
	`28`	`+`
	`29`	`+ buildFeatures {`
	`30`	`+ dataBinding = true`
`30`	`31`	`}`
`31`	`32`	`}`
`32`	`33`
`33`	`34`	`dependencies {`
`34`	`35`	`implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'`
`35`	`36`	`implementation 'androidx.recyclerview:recyclerview:1.1.0'`
`36`		`- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'`
`37`		`- implementation 'com.google.android.material:material:1.0.0'`
	`37`	`+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'`
	`38`	`+ implementation 'com.google.android.material:material:1.2.1'`
`38`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ buildscript {`
`7`	`7`	`jcenter()`
`8`	`8`	`}`
`9`	`9`	`dependencies {`
`10`		`- classpath 'com.android.tools.build:gradle:4.0.0'`
	`10`	`+ classpath 'com.android.tools.build:gradle:4.0.2'`
`11`	`11`
`12`	`12`	`// NOTE: Do not place your application dependencies here; they belong`
`13`	`13`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -31,14 +31,14 @@ android {`
`31`	`31`	`minifyEnabled false`
`32`	`32`	`}`
`33`	`33`	`}`
`34`		`- dataBinding {`
`35`		`- enabled = true`
	`34`	`+ buildFeatures {`
	`35`	`+ dataBinding = true`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`dependencies {`
`40`	`40`	`implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'`
`41`	`41`	`implementation 'com.android.support:appcompat-v7:28.0.0'`
`42`	`42`	`implementation 'com.android.support:recyclerview-v7:28.0.0'`
`43`		`- implementation 'com.android.support.constraint:constraint-layout:1.1.3'`
	`43`	`+ implementation 'com.android.support.constraint:constraint-layout:2.0.4'`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ buildscript {`
`22`	`22`	`jcenter()`
`23`	`23`	`}`
`24`	`24`	`dependencies {`
`25`		`- classpath 'com.android.tools.build:gradle:4.0.0'`
	`25`	`+ classpath 'com.android.tools.build:gradle:4.0.2'`
`26`	`26`
`27`	`27`	`// NOTE: Do not place your application dependencies here; they belong`
`28`	`28`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ buildscript {`
`21`	`21`
`22`	`22`	`}`
`23`	`23`	`dependencies {`
`24`		`- classpath 'com.android.tools.build:gradle:4.0.0'`
	`24`	`+ classpath 'com.android.tools.build:gradle:4.0.2'`
`25`	`25`
`26`	`26`	`// NOTE: Do not place your application dependencies here; they belong`
`27`	`27`	`// in the individual module build.gradle files`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,6 @@ android {`
`31`	`31`	`dependencies {`
`32`	`32`	`implementation 'com.example.glass.ui:gesture-lib-sample:0.1.0-SNAPSHOT'`
`33`	`33`
`34`		`- implementation 'androidx.appcompat:appcompat:1.0.2'`
`35`		`- implementation 'androidx.constraintlayout:constraintlayout:1.1.3'`
	`34`	`+ implementation 'androidx.appcompat:appcompat:1.2.0'`
	`35`	`+ implementation 'androidx.constraintlayout:constraintlayout:2.0.4'`
`36`	`36`	`}`