updates tp verstion 0.2.3

patrickfav · Jan 20, 2017 · b2c9cb4 · b2c9cb4
1 parent 9fc99d5
commit b2c9cb4
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 21 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -72,23 +72,16 @@ dependencies {
 
     testCompile "junit:junit:$rootProject.ext.dependencies.junit"
 
-//    debugCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep")
-//    releaseCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep")
-//
-//    releaseNoopCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep") {
-//        exclude group: 'at.favre.lib.hood', module: 'hood-core'
-//        compile(group: 'at.favre.lib.hood', name: 'hood-core', version: rootProject.ext.versionNameDep,
-//                classifier: 'noop', ext: 'aar', transitive: true)
-//    }
-
-//    compile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep")
-
-//    releaseNoopCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep") {
-//        exclude group: 'at.favre.lib.hood', module: 'hood-core'
-//        compile(group: 'at.favre.lib.hood', name: 'hood-core', version: rootProject.ext.versionNameDep,
-//                classifier: 'noop', ext: 'aar', transitive: true)
-//    }
-    compile project(path: ':hood-extended')
+    debugCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep")
+    releaseCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep")
+
+    releaseNoopCompile("at.favre.lib.hood:hood-extended:$rootProject.ext.versionNameDep") {
+        exclude group: 'at.favre.lib.hood', module: 'hood-core'
+        releaseNoopCompile(group: 'at.favre.lib.hood', name: 'hood-core', version: rootProject.ext.versionNameDep,
+                classifier: 'noop', ext: 'aar', transitive: true)
+    }
+
+//    compile project(path: ':hood-extended')
 }
 
 def String getGitRev() {

diff --git a/build.gradle b/build.gradle
@@ -20,10 +20,10 @@ task clean(type: Delete) {
 }
 
 ext {
-    versionNameApp = "0.2.2"
+    versionNameApp = "0.2.3"
     versionNameLib = "$versionNameApp"
     versionCode = 2
-    versionNameDep = "0.2.2"
+    versionNameDep = "0.2.3"
 
 
     compileSdkVersion = 25

diff --git a/hood-core/build.gradle b/hood-core/build.gradle
@@ -3,7 +3,9 @@ apply plugin: 'com.github.dcendents.android-maven'
 apply plugin: 'com.jfrog.bintray'
 
 android {
-    publishNonDefault true
+    publishNonDefault false
+    defaultPublishConfig "release"
+
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
 
@@ -29,6 +31,18 @@ android {
             consumerProguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+//    libraryVariants.all { variant ->
+//        println "xxxv base: " + variant.getBaseName()
+//        variant.outputs.each { output ->
+//            if (variant.name == "release") {
+//                output.outputFile = new File(
+//                        output.outputFile.parent,
+//                        output.outputFile.name.replace(("-release.aar"), ".aar"))
+//            }
+//        }
+//    }
+
 }
 
 android.variantFilter { variant ->

diff --git a/hood-extended/build.gradle b/hood-extended/build.gradle
@@ -38,7 +38,7 @@ dependencies {
     compile "com.android.support:appcompat-v7:$rootProject.ext.dependencies.support"
     compile "com.android.support:design:$rootProject.ext.dependencies.support"
 
-    compile project(path: ':hood-core', configuration: 'release')
+    compile project(path: ':hood-core')
 
     testCompile "junit:junit:$rootProject.ext.dependencies.junit"
 }

diff --git a/publish.gradle b/publish.gradle
@@ -45,6 +45,7 @@ install {
                 found.type = "aar"
             }
         }
+        println "xxxx: " + new File(project.buildDir, "outputs/aar")
     }
 }
 
@@ -78,6 +79,13 @@ bintray {
     key = properties.getProperty("bintray.apikey")
 
     configurations = ['archives']
+    filesSpec { //When uploading any arbitrary files ('filesSpec' is a standard Gradle CopySpec)
+        from new File(project.buildDir, "outputs/aar")
+        include '*-noop.aar'
+        into "$group/$rootProject.ext.versionNameLib/"
+        rename { name -> "hood-core-$rootProject.ext.versionNameLib-noop.aar" }
+    }
+
     dryRun = false
     publish = true //Whether version should be auto published after an upload
     override = false //[Default: false] Whether to override version artifacts already published