Merge branch 'release/v3.2.7'

mikepenz · Jun 9, 2018 · f2a0f7e · f2a0f7e
2 parents 43ec90b + bbe8f00
commit f2a0f7e
Show file tree

Hide file tree

Showing 17 changed files with 282 additions and 214 deletions.
diff --git a/README.md b/README.md
@@ -41,26 +41,26 @@ You can try it out here [Google Play](https://play.google.com/store/apps/details
 
 The library is split up into core, commons, and extensions. The core functions are included in the following dependency.
 ```gradle
-implementation 'com.mikepenz:fastadapter:3.2.6'
+implementation 'com.mikepenz:fastadapter:3.2.7'
 implementation  'com.android.support:appcompat-v7:${latestSupportLib}'
 implementation  'com.android.support:recyclerview-v7:${latestSupportLib}'
 ```
 
 The commons package comes with some useful helpers (which are not needed in all cases) This one for example includes the `FastItemAdapter`
 ```gradle
-implementation 'com.mikepenz:fastadapter-commons:3.2.6'
+implementation 'com.mikepenz:fastadapter-commons:3.2.7'
 ```
 
 Expandable support is included and can be added via this
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.6'
+implementation 'com.mikepenz:fastadapter-extensions-expandable:3.2.7'
 //The tiny Materialize library used for its useful helper classes
 implementation 'com.mikepenz:materialize:${latestVersion}'
 ```
 
 Many helper classes are included in the following dependency. (This functionality also needs the `Expandable` extension
 ```gradle
-implementation 'com.mikepenz:fastadapter-extensions:3.2.6'
+implementation 'com.mikepenz:fastadapter-extensions:3.2.7'
 implementation  'com.android.support:design:${versions.supportLib}'
 //The tiny Materialize library used for its useful helper classes
 implementation 'com.mikepenz:materialize:${latestVersion}'

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdkVersion setup.minSdk
         targetSdkVersion setup.targetSdk
-        versionCode 3260
-        versionName '3.2.6'
+        versionCode 3270
+        versionName '3.2.7'
 
         setProperty("archivesBaseName", "FastAdapter-v$versionName-c$versionCode")
     }

diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,11 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 buildscript {
     ext {
+        release = [
+                versionName: "3.2.7",
+                versionCode: 3270
+        ]
+
         setup = [
                 compileSdk: 27,
                 buildTools: "27.0.3",
@@ -19,13 +24,13 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:3.1.2'
-        classpath 'com.novoda:bintray-release:0.8.1'
+        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.0'
+        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
     }
 }
 
 allprojects {
     group "com.mikepenz"
-    version "3.2.6"
 
     repositories {
         google()

diff --git a/gradle-jcenter-push.gradle b/gradle-jcenter-push.gradle
diff --git a/gradle-mvn-push.gradle b/gradle-mvn-push.gradle
diff --git a/gradle-release.gradle b/gradle-release.gradle
@@ -0,0 +1,144 @@
+apply plugin: 'maven-publish'
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: "com.jfrog.bintray"
+
+@SuppressWarnings(["GroovyUnusedDeclaration", "GrMethodMayBeStatic"])
+def isReleaseBuild() {
+    return !VERSION_NAME.contains("SNAPSHOT")
+}
+
+@SuppressWarnings("GroovyUnusedDeclaration")
+def getRepositoryUsername() {
+    return hasProperty('NEXUS_USERNAME') ? NEXUS_USERNAME : ""
+}
+
+@SuppressWarnings("GroovyUnusedDeclaration")
+def getRepositoryPassword() {
+    return hasProperty('NEXUS_PASSWORD') ? NEXUS_PASSWORD : ""
+}
+
+if (JavaVersion.current().isJava8Compatible()) {
+    allprojects {
+        tasks.withType(Javadoc) {
+            options.addStringOption('Xdoclint:none', '-quiet')
+        }
+    }
+}
+
+task androidJavadocs(type: Javadoc) {
+    failOnError = false
+    source = android.sourceSets.main.java.source
+    classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+}
+
+task androidJavadocsJar(type: Jar, dependsOn: androidJavadocs) {
+    classifier = 'javadoc'
+    from androidJavadocs.destinationDir
+}
+
+task androidSourcesJar(type: Jar) {
+    classifier = 'sources'
+    from android.sourceSets.main.java.source
+}
+
+bintray {
+    dryRun = false
+    publish = true
+    override = true
+    user = project.hasProperty('bintray.user') ? project.property('bintray.user') : System.getenv('BINTRAY_USER')
+    key = project.hasProperty('bintray.apikey') ? project.property('bintray.apikey') : System.getenv('BINTRAY_API_KEY')
+    def gpgkey = project.hasProperty('bintray.gpg.key') ? project.property('bintray.gpg.key') : System.getenv('BINTRAY_GPG_KEY')
+    def gpgpass = project.hasProperty('bintray.gpg.password') ? project.property('bintray.gpg.password') : System.getenv('BINTRAY_GPG_PASS')
+
+    publications('release')
+    //configurations = ['archives'] // TODO figure out javadoc upload again.
+
+    pkg {
+        publish = true
+
+        repo = "maven"
+        name = POM_ARTIFACT_ID
+        desc = POM_DESCRIPTION
+
+        websiteUrl = POM_URL
+        issueTrackerUrl = POM_SCM_URL_ISSUES
+        vcsUrl = POM_SCM_URL
+
+        githubRepo = POM_GITHUB_REPO
+        githubReleaseNotesFile = POM_GITHUB_README
+
+        publicDownloadNumbers = true
+        licenses = ["Apache-2.0"]
+        version {
+            name = VERSION_NAME
+            vcsTag = VERSION_NAME
+            released = new Date()
+
+            mavenCentralSync {
+                sync = false
+                user = getRepositoryUsername() //OSS user token
+                password = getRepositoryPassword() //OSS user password
+                close = '1'
+            }
+            gpg {
+                sign = true //Determines whether to GPG sign the files. The default is false
+                passphrase = gpgpass //Optional. The passphrase for GPG signing'
+            }
+        }
+    }
+}
+
+ext.addDependency = { dependencyNode, group, name, version ->
+    dependencyNode.appendNode('groupId', group)
+    dependencyNode.appendNode('artifactId', name)
+    dependencyNode.appendNode('version', version)
+    //dependencyNode.appendNode('type', "aar")
+    dependencyNode.appendNode('scope', "compile")
+}
+
+def pomConfig = {
+    licenses {
+        license {
+            name POM_LICENCE_NAME
+            url POM_LICENCE_URL
+            distribution POM_LICENCE_DIST
+        }
+    }
+    developers {
+        developer {
+            id POM_DEVELOPER_ID
+            name POM_DEVELOPER_NAME
+            email '[email protected]'
+        }
+    }
+    scm {
+        url POM_SCM_URL
+        connection POM_SCM_CONNECTION
+        developerConnection POM_SCM_DEV_CONNECTION
+    }
+}
+
+publishing {
+    publications {
+        release(MavenPublication) {
+            pom.withXml {
+                asNode().appendNode('name', POM_NAME);
+                asNode().appendNode('description', POM_DESCRIPTION);
+                asNode().appendNode('url', POM_SCM_URL);
+                def dependenciesNode = asNode().appendNode('dependencies');
+                configurations.implementation.allDependencies.each {
+                    // Ensure dependencies such as fileTree are not included.
+                    if (it.name != 'unspecified') {
+                        def dependencyNode = dependenciesNode.appendNode('dependency')
+                        if (it.version != "unspecified") {
+                            addDependency(dependencyNode, it.group, it.name, it.version)
+                        } else {
+                            addDependency(dependencyNode, it.getDependencyProject().findProperty("GROUP"), it.getDependencyProject().findProperty("POM_ARTIFACT_ID"), it.getDependencyProject().findProperty("VERSION_NAME"))
+                        }
+                    }
+                }
+                asNode().children().last() + pomConfig
+            }
+        }
+    }
+}
diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,19 @@
 # Maven stuff
 GROUP=com.mikepenz
 
-POM_DESCRIPTION=FastAdapter Library
 POM_URL=https://github.com/mikepenz/FastAdapter
+
 POM_SCM_URL=https://github.com/mikepenz/FastAdapter
 POM_SCM_CONNECTION=scm:[email protected]:mikepenz/FastAdapter.git
 POM_SCM_DEV_CONNECTION=scm:[email protected]:mikepenz/FastAdapter.git
+POM_SCM_URL_ISSUES=https://github.com/mikepenz/FastAdapter/issues
+
+POM_GITHUB_REPO=mikepenz/FastAdapter
+POM_GITHUB_README=README.md
+
 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=mikepenz
 POM_DEVELOPER_NAME=Mike Penz