Skip to content

Commit

Permalink
Fixes Gradle error which requires android plugin to be declared in ro…
Browse files Browse the repository at this point in the history
…ot build.gradle only

Also fixes incompatible dependencies.
  • Loading branch information
josh-burton committed Mar 24, 2018
1 parent 86bed6a commit a9f5bc5
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 4 deletions.
15 changes: 15 additions & 0 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
buildscript {
apply from: 'common.gradle'

repositories {
maven {
url "https://maven.google.com"
}
jcenter()
mavenLocal()
}
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
}
}

task clean(type: Delete) {
delete rootProject.buildDir
}
9 changes: 8 additions & 1 deletion googlemaps/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down Expand Up @@ -47,6 +46,14 @@ android {
}
}


configurations.all {
resolutionStrategy {
force "com.android.support:support-media-compat:$android_support_version"
force "com.android.support:support-v4:$android_support_version"
}
}

repositories {
maven {
url "https://maven.google.com"
Expand Down
1 change: 0 additions & 1 deletion mapbox/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
1 change: 0 additions & 1 deletion mapme/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintray_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
Expand Down
1 change: 0 additions & 1 deletion sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ buildscript {
mavenLocal()
}
dependencies {
classpath "com.android.tools.build:gradle:$gradle_version"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand Down

0 comments on commit a9f5bc5

Please sign in to comment.