Added maven package configurations

Author: Rolf-Smit

annotations-processor/build.gradle

@@ -5,6 +5,21 @@ apply plugin: 'java'
 sourceCompatibility = JavaVersion.VERSION_1_7
 targetCompatibility = JavaVersion.VERSION_1_7
 
+
+    /**
+     * Upload new library version:
+     * > gradlew install
+     * > gradlew bintrayUpload
+     */
+
+
+//Without this line the Bintray upload will fail as it uses the module directory name as artifactId
+archivesBaseName = POM_ARTIFACT_ID
+group = GROUP
+version = VERSION_NAME
+
+
+
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile project(':annotations')
@@ -18,3 +33,6 @@ dependencies {
     // Fix for warning: "bootstrap class path not set in conjunction with -source 1.7"
     compileOnly files(Jvm.current().getToolsJar())
 }
+
+apply from: rootProject.file('publish-library.gradle')
+

annotations-processor/gradle.properties

@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=android-retainable-tasks-compiler
+POM_NAME=Android-Retainable-Tasks-Compiler
+POM_PACKAGING=jar

annotations/build.gradle

@@ -10,4 +10,6 @@ dependencies {
 
     // Fix for warning: "bootstrap class path not set in conjunction with -source 1.7"
     compileOnly files(Jvm.current().getToolsJar())
-}
+}
+
+apply from: rootProject.file('publish-library.gradle')

annotations/gradle.properties

@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=android-retainable-tasks-annotations
+POM_NAME=Android-Retainable-Tasks-Annotations
+POM_PACKAGING=jar

build.gradle

@@ -6,9 +6,12 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.6'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'
-        //classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
+
+        // Bintray
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
+
+        // Maven for Android projects
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }

demo/build.gradle

@@ -21,6 +21,7 @@ android {
 
 dependencies {
     compile project(':library')
+    compile project(":annotations")
     annotationProcessor project(":annotations-processor")
     //compile 'org.neotech.library:android-retainable-tasks:1.0.0-alpha-1'
 

gradle.properties

@@ -15,4 +15,25 @@
 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
-# org.gradle.parallel=true
+# org.gradle.parallel=true
+
+GROUP=org.neotech.library
+VERSION_NAME=1.0.0-alpha-1
+
+BINTRAY_REPO=maven
+BINTRAY_LICENCE=Apache-2.0
+
+POM_DESCRIPTION=Android-Retainable-Tasks is an easy to use mini-library for easy asynchronous background tasking with callback support to the UI. This library is based on the Android AsyncTask implementation but with support for retaining tasks and therefore surviving configuration changes (orientation).
+
+POM_URL=https://github.com/NeoTech-Software/Android-Retainable-Tasks
+POM_SCM_URL=https://github.com/NeoTech-Software/Android-Retainable-Tasks
+POM_SCM_CONNECTION=scm:git:git://github.com/NeoTech-Software/Android-Retainable-Tasks.git
+POM_SCM_DEV_CONNECTION=scm:git:git://github.com/NeoTech-Software/Android-Retainable-Tasks.git
+
+POM_LICENCE_NAME=The Apache Software License, Version 2.0
+POM_LICENCE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=rolf-smit
+POM_DEVELOPER_NAME=Rolf Smit
+POM_DEVELOPER_EMAIL=[email protected]

library/build.gradle

@@ -1,12 +1,14 @@
 apply plugin: 'com.android.library'
 
-ext {
+//ext {
     /**
      * Upload new library version:
      * > gradlew install
      * > gradlew bintrayUpload
      */
 
+/*
+
     bintrayRepo = 'maven'
     bintrayName = 'android-retainable-tasks' //Should match the name of the Bintray online repository
 
@@ -29,11 +31,12 @@ ext {
     licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
     allLicenses = ["Apache-2.0"]
 }
+*/
 
 //Without this line the Bintray upload will fail as it uses the module directory name as artifactId
-archivesBaseName = artifact
-group = publishedGroupId
-version = libraryVersion
+archivesBaseName = POM_ARTIFACT_ID
+group = GROUP
+version = VERSION_NAME
 
 android {
     compileSdkVersion 25
@@ -42,7 +45,7 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 25
-        versionName = libraryVersion
+        versionName = VERSION_NAME
     }
     buildTypes {
         release {
@@ -53,17 +56,24 @@ android {
 }
 
 configurations {
-    javadocCompile
+    javadoc
 }
 
 dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
+
+    compile project(':annotations')
+
+    // Android Architecture Lifecycle library to support using the TaskManagerLifeCycleProxy in
+    // combination with LifecycleOwner.getLifecycle().addObserver().
     compile 'android.arch.lifecycle:extensions:1.0.0-alpha1'
     annotationProcessor "android.arch.lifecycle:compiler:1.0.0-alpha1"
-    testCompile 'junit:junit:4.12'
+
+    // Support library for the support library specific TaskManagerOwners (TaskActivityCompat).
     compile 'com.android.support:appcompat-v7:25.3.1'
-    javadocCompile 'com.android.support:appcompat-v7:25.3.1'
-    compile project(':annotations')
+    javadoc 'com.android.support:appcompat-v7:25.3.1'
+
+    testCompile 'junit:junit:4.12'
 }
 
-apply from: 'publish-library.gradle'
+apply from: rootProject.file('publish-library.gradle')

library/gradle.properties

@@ -0,0 +1,3 @@
+POM_ARTIFACT_ID=android-retainable-tasks
+POM_NAME=Android-Retainable-Tasks
+POM_PACKAGING=aar

library/publish-library.gradle renamed to publish-library.gradle

@@ -1,55 +1,62 @@
 apply plugin: 'com.github.dcendents.android-maven'
 
-group = publishedGroupId // Maven Group ID for the artifact
+
+
+
+group = GROUP // Maven Group ID for the artifact
 
 install {
     repositories.mavenInstaller {
         // This generates POM.xml with proper parameters
+
         pom {
 
+            groupId = GROUP
+            artifactId = POM_ARTIFACT_ID
+            version = VERSION_NAME
+
             project {
-                packaging 'aar'
-                groupId publishedGroupId
-                artifactId artifact
+                packaging POM_PACKAGING
+
 
                 // Add your description here
-                name libraryName
-                description libraryDescription
-                url siteUrl
+                name POM_NAME
+                description POM_DESCRIPTION
+                url POM_URL
 
                 // Set your license
                 licenses {
                     license {
-                        name licenseName
-                        url licenseUrl
+                        name POM_LICENCE_NAME
+                        url POM_LICENCE_URL
                     }
                 }
                 developers {
                     developer {
-                        id developerId
-                        name developerName
-                        email developerEmail
+                        id POM_DEVELOPER_ID
+                        name POM_DEVELOPER_NAME
+                        email POM_DEVELOPER_EMAIL
                     }
                 }
                 scm {
-                    connection gitUrl
-                    developerConnection gitUrl
-                    url siteUrl
+                    connection POM_SCM_CONNECTION
+                    developerConnection POM_SCM_DEV_CONNECTION
+                    url POM_SCM_URL
 
                 }
             }
         }
     }
 }
 
-
-
-
 apply plugin: 'com.jfrog.bintray'
 
-version = libraryVersion
+version = VERSION_NAME
+
+if (project.getPlugins().hasPlugin('com.android.application') ||
+        project.getPlugins().hasPlugin('com.android.library')) {
+    // Android libraries
 
-if (project.hasProperty("android")) { // Android libraries
     task sourcesJar(type: Jar) {
         classifier = 'sources'
         from android.sourceSets.main.java.srcDirs
@@ -60,7 +67,15 @@ if (project.hasProperty("android")) { // Android libraries
         failOnError = false
         classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
     }
-} else { // Java libraries
+
+    // Makes sure JavaDoc knows our dependencies
+    afterEvaluate {
+        javadoc.classpath += files(android.libraryVariants.collect { variant ->
+            variant.javaCompile.classpath.files
+        })
+    }
+} else {
+    // Java libraries
     task sourcesJar(type: Jar, dependsOn: classes) {
         classifier = 'sources'
         from sourceSets.main.allSource
@@ -69,7 +84,7 @@ if (project.hasProperty("android")) { // Android libraries
 
 task javadocJar(type: Jar, dependsOn: javadoc) {
     classifier = 'javadoc'
-    from javadoc.destinationDir
+    from javadoc.getDestinationDir()
 }
 
 artifacts {
@@ -86,24 +101,20 @@ bintray {
     key = properties.getProperty("bintray.apikey")
 
     configurations = ['archives']
+
+    // Bintry package information
     pkg {
-        repo = bintrayRepo
-        name = bintrayName
-        desc = libraryDescription
-        websiteUrl = siteUrl
-        vcsUrl = gitUrl
-        licenses = allLicenses
+        repo = BINTRAY_REPO
+        name = POM_ARTIFACT_ID
+        desc = POM_DESCRIPTION
+        websiteUrl = POM_URL
+        vcsUrl = POM_SCM_URL
+        licenses = [BINTRAY_LICENCE]
         publish = true
         publicDownloadNumbers = true
         version {
-            desc = libraryDescription
-            /*
-            gpg {
-                sign = true //Determines whether to GPG sign the files. The default is false
-                passphrase = properties.getProperty("bintray.gpg.password")
-                //Optional. The passphrase for GPG signing'
-            }
-            */
+            name = VERSION_NAME
+            released = new Date();
         }
     }
 }