Merge pull request #234 from ultrasonic/repo-chore

Repo chore

.circleci/config.yml

@@ -25,12 +25,12 @@ jobs:
       - run:
           name: unit-tests
           command: |
-            ./gradlew :subsonic-api:test :cache:test :subsonic-api-image-loader:testDebugUnitTest :ultrasonic:testDebugUnitTest
+            ./gradlew ciTest testDebugUnitTest
             ./gradlew jacocoFullReport
             bash <(curl -s https://codecov.io/bash)
       - run:
           name: lint
-          command: ./gradlew lint
+          command: ./gradlew :ultrasonic:lintRelease
       - run:
           name: assemble release build
           command: ./gradlew assembleRelease

build.gradle

@@ -2,6 +2,11 @@
 buildscript {
     apply from: 'dependencies.gradle'
 
+    ext.bootstrap = [
+            kotlinModule : "${project.rootDir}/gradle_scripts/kotlin-module-bootstrap.gradle",
+            androidModule : "${project.rootDir}/gradle_scripts/android-module-bootstrap.gradle"
+    ]
+
     repositories {
         jcenter()
         google()

cache/build.gradle

@@ -1,46 +0,0 @@
-apply plugin: 'java-library'
-apply plugin: 'kotlin'
-apply plugin: 'jacoco'
-apply from: '../gradle_scripts/code_quality.gradle'
-
-dependencies {
-    api project(':domain')
-    api other.kotlinStdlib
-    api other.twitterSerial
-
-    testImplementation testing.junit
-    testImplementation testing.kotlinJunit
-    testImplementation testing.mockito
-    testImplementation testing.mockitoInline
-    testImplementation testing.mockitoKotlin
-    testImplementation testing.kluent
-}
-
-jacoco {
-    toolVersion(versions.jacoco)
-}
-
-ext {
-    jacocoExclude = []
-}
-
-jacocoTestReport {
-    reports {
-        html.enabled true
-        csv.enabled false
-        xml.enabled true
-    }
-
-    afterEvaluate {
-        classDirectories = files(classDirectories.files.collect {
-            fileTree(dir: it, excludes: jacocoExclude)
-        })
-    }
-}
-
-test.finalizedBy jacocoTestReport
-test {
-    jacoco {
-        excludes += jacocoExclude
-    }
-}

core/cache/build.gradle

@@ -0,0 +1,12 @@
+apply from: bootstrap.kotlinModule
+
+dependencies {
+    api project(':core:domain')
+    api other.twitterSerial
+
+    testImplementation testing.kotlinJunit
+    testImplementation testing.mockito
+    testImplementation testing.mockitoInline
+    testImplementation testing.mockitoKotlin
+    testImplementation testing.kluent
+}

core/domain/build.gradle

@@ -0,0 +1,10 @@
+apply from: bootstrap.kotlinModule
+
+ext {
+    jacocoExclude = [
+            '**/domain/**'
+    ]
+}
+dependencies {
+    api other.semver
+}

core/library/build.gradle

@@ -0,0 +1,13 @@
+apply from: bootstrap.androidModule
+apply plugin: 'com.android.library'
+
+android {
+    lintOptions {
+        baselineFile file("lint-baseline.xml")
+        abortOnError true
+    }
+}
+
+dependencies {
+    api androidSupport.support
+}

core/library/src/main/AndroidManifest.xml

@@ -3,6 +3,4 @@
       package="com.mobeta.android.dslv"
       android:versionCode="4"
       android:versionName="0.6.1">
-    <uses-sdk android:targetSdkVersion="7"
-      android:minSdkVersion="7" />
-</manifest> 
+</manifest>

core/menudrawer/build.gradle

@@ -0,0 +1,8 @@
+apply from: bootstrap.androidModule
+
+android {
+    lintOptions {
+        baselineFile file("lint-baseline.xml")
+        abortOnError true
+    }
+}

core/menudrawer/src/main/AndroidManifest.xml

@@ -3,6 +3,4 @@
       package="net.simonvt.menudrawer"
       android:versionCode="6"
       android:versionName="3.0.2">
-
-    <uses-sdk android:minSdkVersion="7" android:targetSdkVersion="16" />
 </manifest>

core/pulltorefresh/build.gradle

@@ -0,0 +1,8 @@
+apply from: bootstrap.androidModule
+
+android {
+    lintOptions {
+        baselineFile file("lint-baseline.xml")
+        abortOnError true
+    }
+}

core/pulltorefresh/src/main/AndroidManifest.xml

@@ -3,6 +3,4 @@
     package="com.handmark.pulltorefresh.library"
     android:versionCode="2110"
     android:versionName="2.1.1">
-
-    <uses-sdk android:minSdkVersion="4" android:targetSdkVersion="16" />
 </manifest>