Skip to content

Commit 4dd5264

Browse files
committedOct 23, 2019
Update to compose version 0.1.0-dev02.
Change-Id: Ia608fed54aa23ef577ed6f4cece68879506f150c
1 parent 61996aa commit 4dd5264

File tree

2 files changed

+17
-43
lines changed

2 files changed

+17
-43
lines changed
 

‎JetNews/app/build.gradle

Lines changed: 11 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -14,24 +14,9 @@
1414
* limitations under the License.
1515
*/
1616

17-
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
18-
1917
apply plugin: 'com.android.application'
2018
apply plugin: 'kotlin-android'
2119

22-
Configuration kotlinPluginConfiguration = configurations.create("kotlinPlugin")
23-
tasks.withType(KotlinCompile).configureEach { compile ->
24-
compile.dependsOn(kotlinPluginConfiguration)
25-
compile.doFirst {
26-
kotlinOptions {
27-
useIR = true
28-
freeCompilerArgs = [
29-
"-Xplugin=${kotlinPluginConfiguration.files.first()}"
30-
]
31-
}
32-
}
33-
}
34-
3520
android {
3621
compileSdkVersion 29
3722
defaultConfig {
@@ -40,7 +25,6 @@ android {
4025
targetSdkVersion 29
4126
versionCode 1
4227
versionName "1.0"
43-
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
4428
}
4529
buildTypes {
4630
release {
@@ -57,28 +41,27 @@ android {
5741
kotlinOptions {
5842
jvmTarget = "1.8"
5943
}
44+
45+
buildFeatures {
46+
compose true
47+
}
6048
}
6149

6250
configurations {
6351
ktlint
6452
}
6553

66-
dependencies {
67-
// Needed for Compose Kotlin compiler
68-
kotlinPlugin "androidx.compose:compose-compiler:0.1.0-SNAPSHOT"
54+
ext.compose_version = "0.1.0-dev02"
6955

70-
// Actual dependencies of the application
56+
dependencies {
7157
implementation ("org.jetbrains.kotlin:kotlin-stdlib-jdk7:1.3.60-eap-25")
72-
73-
implementation ('androidx.compose:compose-runtime:0.1.0-SNAPSHOT')
74-
implementation ('androidx.ui:ui-framework:0.1.0-SNAPSHOT')
75-
implementation ('androidx.ui:ui-layout:0.1.0-SNAPSHOT')
76-
implementation ('androidx.ui:ui-material:0.1.0-SNAPSHOT')
77-
implementation "androidx.ui:ui-tooling:0.1.0-SNAPSHOT"
78-
58+
implementation ("androidx.compose:compose-runtime:$compose_version")
59+
implementation ("androidx.ui:ui-framework:$compose_version")
60+
implementation ("androidx.ui:ui-layout:$compose_version")
61+
implementation ("androidx.ui:ui-material:$compose_version")
62+
implementation "androidx.ui:ui-tooling:$compose_version"
7963
implementation ('androidx.appcompat:appcompat:1.1.0')
8064
implementation ('androidx.activity:activity-ktx:1.0.0')
81-
8265
implementation "androidx.core:core-ktx:1.1.0"
8366
ktlint "com.pinterest:ktlint:0.34.2"
8467
}

‎JetNews/build.gradle.kts

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -15,34 +15,25 @@
1515
*/
1616

1717
buildscript {
18-
val workdir = File("../..").absolutePath
19-
val externalM2RepoPath = "$workdir/androidx-master-dev/prebuilts/androidx/external"
2018
repositories {
21-
maven {
22-
url = uri(externalM2RepoPath)
23-
}
2419
google()
2520
jcenter()
21+
maven {
22+
url = uri("https://dl.bintray.com/kotlin/kotlin-eap")
23+
}
2624
}
27-
2825
dependencies {
2926
classpath("com.android.tools.build:gradle:4.0.0-alpha01")
3027
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.60-eap-25")
3128
}
3229
}
3330

3431
allprojects {
35-
val workdir = File("../..").absolutePath
36-
val externalM2RepoPath = "$workdir/androidx-master-dev/prebuilts/androidx/external"
37-
val snapshotUrl = "https://ci.android.com/builds/submitted/5946345/androidx_snapshot/latest/ui/repository/"
3832
repositories {
39-
maven {
40-
url = uri(snapshotUrl)
41-
}
42-
maven {
43-
url = uri(externalM2RepoPath)
44-
}
4533
google()
4634
jcenter()
35+
maven {
36+
url = uri("https://dl.bintray.com/kotlin/kotlin-eap")
37+
}
4738
}
4839
}

0 commit comments

Comments
 (0)
Please sign in to comment.