Skip to content

Commit

Permalink
Build fixes, bump AGP and KotlinPoet (#27)
Browse files Browse the repository at this point in the history
* Try fixing Travis build

* Try changing the image

* Try bumping Gradle version

* Disable configuration on demand and parallel build

* Fix Travis settings, try again with just configure on demand turned off

* Bump AGP and KotlinPoet

* Enable Gradle metadata on Android artifacts since publishing seems to be fixed in newer AGP versions
  • Loading branch information
erikc5000 authored Jan 12, 2020
1 parent 2f53a7a commit 3d6d301
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
2 changes: 1 addition & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ plugins {
dependencies {
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.61")
implementation("org.jetbrains.dokka:dokka-gradle-plugin:0.10.0")
implementation("com.android.tools.build:gradle:3.6.0-beta05")
implementation("com.android.tools.build:gradle:3.6.0-rc01")
}

kotlinDslPluginOptions {
Expand Down
5 changes: 0 additions & 5 deletions buildSrc/src/main/kotlin/android-library.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,4 @@ afterEvaluate {
}
}
}

// Disable module metadata since it seems to be broken at the moment
tasks.named("generateMetadataFileForReleaseAarPublication") {
enabled = false
}
}
1 change: 0 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ releaseRepositoryUrl=https://oss.sonatype.org/service/local/staging/deploy/maven

kotlin.code.style=official

org.gradle.configureondemand=true
org.gradle.parallel=true
org.gradle.jvmargs=-Xmx4096M

Expand Down
2 changes: 1 addition & 1 deletion tools/code-generator/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {

dependencies {
implementation(kotlin("stdlib-jdk8"))
implementation("com.squareup:kotlinpoet:1.4.4")
implementation("com.squareup:kotlinpoet:1.5.0")
}

application {
Expand Down

0 comments on commit 3d6d301

Please sign in to comment.