Merge pull request #3013 from hannesa2/buildImprovements
Build improvements
This commit is contained in:
commit
c1bfb9183c
|
@ -1,29 +1,14 @@
|
|||
buildscript {
|
||||
repositories {
|
||||
jcenter()
|
||||
}
|
||||
dependencies {
|
||||
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
|
||||
}
|
||||
}
|
||||
|
||||
plugins {
|
||||
id('com.github.triplet.play') version '2.0.0'
|
||||
}
|
||||
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
|
||||
apply plugin: "com.android.application"
|
||||
apply plugin: 'com.getkeepsafe.dexcount'
|
||||
|
||||
repositories {
|
||||
maven { url "https://jitpack.io" }
|
||||
mavenCentral()
|
||||
}
|
||||
import org.apache.tools.ant.filters.ReplaceTokens
|
||||
|
||||
android {
|
||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||
buildToolsVersion rootProject.ext.buildToolsVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
|
@ -228,10 +213,3 @@ task copyTextFiles(type: Copy) {
|
|||
|
||||
preBuild.dependsOn filterAbout, copyTextFiles
|
||||
|
||||
allprojects {
|
||||
gradle.projectsEvaluated {
|
||||
tasks.withType(JavaCompile) {
|
||||
options.compilerArgs << "-Xlint" << "-Xlint:-deprecation" << "-Xlint:-serial"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
11
build.gradle
11
build.gradle
|
@ -6,8 +6,7 @@ buildscript {
|
|||
}
|
||||
dependencies {
|
||||
classpath 'com.android.tools.build:gradle:3.3.0'
|
||||
// Exclude the version that the android plugin depends on.
|
||||
configurations.classpath.exclude group: "com.android.tools.external.lombok"
|
||||
classpath 'com.getkeepsafe.dexcount:dexcount-gradle-plugin:0.8.5'
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -15,6 +14,13 @@ allprojects {
|
|||
repositories {
|
||||
google()
|
||||
jcenter()
|
||||
maven { url "https://jitpack.io" }
|
||||
}
|
||||
|
||||
gradle.projectsEvaluated {
|
||||
tasks.withType(JavaCompile) {
|
||||
options.compilerArgs << "-Xlint" << "-Xlint:-deprecation" << "-Xlint:-serial"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -35,7 +41,6 @@ subprojects {
|
|||
|
||||
project.ext {
|
||||
compileSdkVersion = 26
|
||||
buildToolsVersion = "28.0.3"
|
||||
minSdkVersion = 14
|
||||
targetSdkVersion = 26
|
||||
|
||||
|
|
|
@ -2,7 +2,6 @@ apply plugin: "com.android.library"
|
|||
|
||||
android {
|
||||
compileSdkVersion rootProject.ext.compileSdkVersion
|
||||
buildToolsVersion rootProject.ext.buildToolsVersion
|
||||
|
||||
defaultConfig {
|
||||
minSdkVersion rootProject.ext.minSdkVersion
|
||||
|
@ -41,11 +40,6 @@ android {
|
|||
|
||||
}
|
||||
|
||||
repositories {
|
||||
maven { url "https://jitpack.io" }
|
||||
mavenCentral()
|
||||
}
|
||||
|
||||
dependencies {
|
||||
implementation "com.android.support:support-v4:$supportVersion"
|
||||
implementation "com.android.support:appcompat-v7:$supportVersion"
|
||||
|
@ -99,11 +93,3 @@ tasks.withType(Test) {
|
|||
displayGranularity 2
|
||||
}
|
||||
}
|
||||
|
||||
allprojects {
|
||||
gradle.projectsEvaluated {
|
||||
tasks.withType(JavaCompile) {
|
||||
options.compilerArgs << "-Xlint" << "-Xlint:-deprecation" << "-Xlint:-serial"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue