Merge pull request android#83 from android/dev10_update

florina-muntenescu · web-flow · commit 442417156a29 · 2020-04-30T13:41:26.000+01:00
Update to dev10
diff --git a/JetNews/app/build.gradle b/JetNews/app/build.gradle
@@ -48,6 +48,7 @@ android {
         compose true
     }
     composeOptions {
+        kotlinCompilerVersion "1.3.70-dev-withExperimentalGoogleExtensions-20200424"
         kotlinCompilerExtensionVersion "$compose_compiler_extension_version"
     }
 }
diff --git a/JetNews/build.gradle b/JetNews/build.gradle
@@ -17,7 +17,7 @@
 buildscript {
     ext.kotlin_version = '1.3.71'
 
-    def compose_release_version = "dev09"
+    def compose_release_version = "dev10"
     ext.compose_version = "0.1.0-$compose_release_version"
     ext.compose_compiler_extension_version = "0.1.0-$compose_release_version"
 
@@ -26,7 +26,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.0-alpha05'
+        classpath 'com.android.tools.build:gradle:4.1.0-alpha08'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -48,6 +48,7 @@ android {`
`48`	`48`	`compose true`
`49`	`49`	`}`
`50`	`50`	`composeOptions {`
	`51`	`+ kotlinCompilerVersion "1.3.70-dev-withExperimentalGoogleExtensions-20200424"`
`51`	`52`	`kotlinCompilerExtensionVersion "$compose_compiler_extension_version"`
`52`	`53`	`}`
`53`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@`
`17`	`17`	`buildscript {`
`18`	`18`	`ext.kotlin_version = '1.3.71'`
`19`	`19`
`20`		`- def compose_release_version = "dev09"`
	`20`	`+ def compose_release_version = "dev10"`
`21`	`21`	`ext.compose_version = "0.1.0-$compose_release_version"`
`22`	`22`	`ext.compose_compiler_extension_version = "0.1.0-$compose_release_version"`
`23`	`23`
`@@ -26,7 +26,7 @@ buildscript {`
`26`	`26`	`jcenter()`
`27`	`27`	`}`
`28`	`28`	`dependencies {`
`29`		`- classpath 'com.android.tools.build:gradle:4.1.0-alpha05'`
	`29`	`+ classpath 'com.android.tools.build:gradle:4.1.0-alpha08'`
`30`	`30`	`classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"`
`31`	`31`	`}`
`32`	`32`	`}`