Skip to content

Commit

Permalink
Clean up before adding bintray plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
kpmmmurphy committed Feb 6, 2017
1 parent 5006925 commit 3c904ac
Show file tree
Hide file tree
Showing 33 changed files with 46 additions and 79 deletions.
File renamed without changes.
File renamed without changes.
11 changes: 10 additions & 1 deletion library/build.gradle → alerter/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ android {
}

lintOptions {
abortOnError false
abortOnError true
}
}

configurations {
javadocDeps
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

Expand All @@ -47,4 +51,9 @@ dependencies {
androidTestCompile(rootProject.ext.libs.espresso, {
exclude group: 'com.android.support', module: 'support-annotations'
})

//Javadocs References
javadocDeps rootProject.ext.libs.support_annotations
javadocDeps rootProject.ext.libs.support_v4
javadocDeps rootProject.ext.libs.appcompat_v7
}
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -264,8 +264,7 @@ public void run() {
/* Setters and Getters */

/**
* Sets the Alert Background colour. Use {@link ContextCompat#getColor(Context, int)} to resolve
* the colour resource id
* Sets the Alert Background colour
*
* @param color The qualified colour integer
*/
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])

compile project(":library")
compile project(':alerter')

compile rootProject.ext.libs.support_v4
compile rootProject.ext.libs.appcompat_v7
Expand Down
7 changes: 1 addition & 6 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,4 @@ allprojects {

task clean(type: Delete) {
delete rootProject.buildDir
}

task printRoot() {
println rootProject.rootDir
println rootProject.buildDir
}
}
10 changes: 3 additions & 7 deletions common.gradle
Original file line number Diff line number Diff line change
@@ -1,24 +1,20 @@
//apply from: rootProject.file('nexus.gradle')
//apply plugin: 'com.github.dcendents.android-maven'
//apply plugin: 'sputnik'

group = POM_GROUP
//

android {
compileSdkVersion rootProject.ext.compileSdkVersion
buildToolsVersion rootProject.ext.buildToolsVersion
}


task sourcesJar(type: Jar) {
from android.sourceSets.main.java.srcDirs
classifier = 'sources'
}

task javadoc(type: Javadoc) {
failOnError false
failOnError true
source = android.sourceSets.main.java.srcDirs
classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
classpath += configurations.compile
}

task javadocJar(type: Jar, dependsOn: javadoc) {
Expand Down
6 changes: 4 additions & 2 deletions dependencies.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,20 @@ ext {
minSdkVersion = 16
targetSdkVersion = 25

supportLibVersion = '25.1.1'
buildToolsVersion = '25.0.2'

sourceCompatibilityVersion = JavaVersion.VERSION_1_8
targetCompatibilityVersion = JavaVersion.VERSION_1_8

supportLibVersion = '25.1.1'
retrofitVersion = "2.1.0"
kotlin_version = "1.0.5-3"

libs = [
/* Application Dependencies */

android_gradle : 'com.android.tools.build:gradle:2.2.3',

/* Application Dependencies */
support_design : "com.android.support:design:$supportLibVersion",
support_v4 : "com.android.support:support-v4:$supportLibVersion",
appcompat_v7 : "com.android.support:appcompat-v7:$supportLibVersion",
Expand Down
47 changes: 0 additions & 47 deletions nexus.gradle

This file was deleted.

37 changes: 25 additions & 12 deletions quality.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,46 +4,55 @@ apply plugin: 'findbugs'
apply plugin: 'pmd'

def final String QUALITY_DIR = "quality"
def final String SOURCE = "src"
def final String INCLUDE_JAVA = "**/*.java"
def final String EXCLUDE_GENERATED = "**/gen/**"

android {
lintOptions {
abortOnError true
xmlReport false
htmlReport true
xmlReport false
htmlReport true

lintConfig file("${project.rootDir}/${QUALITY_DIR}/lint/lint.xml")
htmlOutput file("$project.buildDir/reports/lint/lint-result.html")
xmlOutput file("$project.buildDir/reports/lint/lint-result.xml")
xmlOutput file("$project.buildDir/reports/lint/lint-result.xml")
}
}

checkstyle {
toolVersion = '7.5'
}

/*
* Check Styles - is a development tool to help programmers write Java code that adheres to a coding standard.
*/
task checkstyle(type: Checkstyle) {
configFile = file("${rootProject.rootDir}/${QUALITY_DIR}/checkstyle/checkstyle.xml")

def suppressionsFile = new File("${project.rootDir}/${QUALITY_DIR}/checkstyle/suppressions.xml")

configProperties.checkstyleSuppressionsPath = suppressionsFile.absolutePath

source 'src'
include '**/*.java'
exclude '**/gen/**'
source SOURCE
include INCLUDE_JAVA
exclude EXCLUDE_GENERATED
classpath = files()
}

/*
* Find Bugs - a program which uses static analysis to look for bugs in Java code.
*/
task findbugs(type: FindBugs) {
ignoreFailures = false
effort = "max"
reportLevel = "high"
excludeFilter = new File("${project.rootDir}/${QUALITY_DIR}/findbugs/findbugs-filter.xml")
classes = files("${project.buildDir}/intermediates/classes")

source 'src'
include '**/*.java'
exclude '**/gen/**'
source SOURCE
include INCLUDE_JAVA
exclude EXCLUDE_GENERATED

reports {
xml.enabled = false
Expand All @@ -56,17 +65,21 @@ task findbugs(type: FindBugs) {
destination "$project.buildDir/reports/findbugs/findbugs.html"
}
}

classpath = files()
}

/*
* Programming Mistake Detector - a source code analyzer. It finds common programming flaws.
*/
task pmd(type: Pmd) {
ignoreFailures = false
ruleSetFiles = files("${project.rootDir}/${QUALITY_DIR}/pmd/pmd-ruleset.xml")
ruleSets = []

source 'src'
include '**/*.java'
exclude '**/gen/**'
source SOURCE
include INCLUDE_JAVA
exclude EXCLUDE_GENERATED

reports {
xml.enabled = false
Expand Down
2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':library', ':app'
include ':alerter', ':app'

0 comments on commit 3c904ac

Please sign in to comment.