From 96745bab7d0a6c63f64e9af948cdaaea4698288a Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 17:47:32 +0200 Subject: [PATCH 01/11] Updated Kotlin version to 1.2.51 --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 9804ad1..6657b11 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.2.50' + ext.kotlin_version = '1.2.51' ext.support_lib_version = '27.1.1' repositories { jcenter() From 095203e5bff653c62540385b8415e2c03e0f58cd Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 18:54:51 +0200 Subject: [PATCH 02/11] Updated publishing setup --- build.gradle | 6 ++-- library/build.gradle | 72 ++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 72 insertions(+), 6 deletions(-) diff --git a/build.gradle b/build.gradle index 6657b11..e9b75c7 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,3 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { ext.kotlin_version = '1.2.51' ext.support_lib_version = '27.1.1' @@ -11,8 +9,8 @@ buildscript { classpath 'com.android.tools.build:gradle:3.1.3' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" - // NOTE: Do not place your application dependencies here; they belong - // in the individual module build.gradle files + classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4' + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' } } diff --git a/library/build.gradle b/library/build.gradle index e0fa92c..87abad6 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -1,12 +1,16 @@ apply plugin: 'com.android.library' apply plugin: 'kotlin-android' +apply plugin: 'maven-publish' +apply plugin: 'com.github.dcendents.android-maven' +apply plugin: "com.jfrog.bintray" + apply from: '../testformatter.gradle' ext { PUBLISH_GROUP_ID = 'co.zsmb' PUBLISH_ARTIFACT_ID = 'materialdrawer-kt' - PUBLISH_VERSION = '1.3.5' + PUBLISH_VERSION = '1.3.6' } android { @@ -34,4 +38,68 @@ dependencies { implementation "com.android.support:design:$support_lib_version" } -apply from: 'https://raw.githubusercontent.com/blundell/release-android-library/master/android-release-aar.gradle' +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 + override = true + + Properties properties = new Properties() + properties.load(project.rootProject.file('local.properties').newDataInputStream()) + user = properties.getProperty('bintrayUser') ?: System.getenv('BINTRAY_USER') + key = properties.getProperty('bintrayKey') ?: System.getenv('BINTRAY_API_KEY') + + publications('release') + + pkg { + repo = "MaterialDrawerKt" + name = "MaterialDrawerKt" + vcsUrl = "https://gitlab.com/zsmb/MaterialDrawerKt" + + publicDownloadNumbers = true + licenses = ["Apache-2.0"] + version { + name = PUBLISH_VERSION + vcsTag = PUBLISH_VERSION + released = new Date() + } + } + + publishing { + publications { + release(MavenPublication) { + groupId PUBLISH_GROUP_ID + artifactId PUBLISH_ARTIFACT_ID + version PUBLISH_VERSION + artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") + artifact androidSourcesJar + artifact androidJavadocsJar + + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + + project.configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + } + } + } +} From 63dc12abd2e02ba0b3c559560185187e3e58c43e Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 18:58:42 +0200 Subject: [PATCH 03/11] Updated CI script --- .gitlab-ci.yml | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2dc1c3a..9bae69c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,7 +1,7 @@ image: registry.gitlab.com/hardysim/android-ci:latest stages: -- debug +- build - release before_script: @@ -10,20 +10,34 @@ before_script: - chmod +x ./gradlew debug build: - stage: debug + stage: build tags: - docker script: - ./gradlew assembleDebug + except: + - dev -library release: - stage: release +library release build: + stage: build tags: - docker script: - - ./gradlew generateRelease + - ./gradlew clean library:assembleRelease androidSourcesJar androidJavadocsJar artifacts: paths: - - library/build/release-* + - library/build* + only: + - dev + +library upload to Bintray: + stage: release + tags: + - docker + script: + - ./gradlew generatePomFileForReleasePublication bintrayUpload + dependencies: + - library release build only: - - master + - dev + when: manual From 775c29e76ae23cef80e6f4dc351156f47d9378bb Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:04:15 +0200 Subject: [PATCH 04/11] Make local.properties optional --- library/build.gradle | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/library/build.gradle b/library/build.gradle index 87abad6..e1ed98f 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -59,7 +59,12 @@ bintray { override = true Properties properties = new Properties() - properties.load(project.rootProject.file('local.properties').newDataInputStream()) + + def localPropsFile = project.rootProject.file('local.properties') + if (localPropsFile.exists()) { + properties.load(localPropsFile.newDataInputStream()) + } + user = properties.getProperty('bintrayUser') ?: System.getenv('BINTRAY_USER') key = properties.getProperty('bintrayKey') ?: System.getenv('BINTRAY_API_KEY') From a093ee08a51f4170685fe27592050d2418aaaabd Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:04:46 +0200 Subject: [PATCH 05/11] Added cache setting to CI --- .gitlab-ci.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9bae69c..e74c762 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,11 @@ image: registry.gitlab.com/hardysim/android-ci:latest +cache: + paths: + - .gradle/wrapper + - .gradle/caches + - .android/build-cache/ + stages: - build - release From 5a90f6e8d4edacb760a880b99cc107dcf2d5c560 Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:23:12 +0200 Subject: [PATCH 06/11] Updated CI script --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e74c762..484d513 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ debug build: script: - ./gradlew assembleDebug except: - - dev + - master library release build: stage: build @@ -34,7 +34,7 @@ library release build: paths: - library/build* only: - - dev + - master library upload to Bintray: stage: release @@ -45,5 +45,5 @@ library upload to Bintray: dependencies: - library release build only: - - dev + - master when: manual From 3ef269265d0e964ebcbf17fcc22a86e36f20ca35 Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:26:50 +0200 Subject: [PATCH 07/11] Updated CI script --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 484d513..e74c762 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ debug build: script: - ./gradlew assembleDebug except: - - master + - dev library release build: stage: build @@ -34,7 +34,7 @@ library release build: paths: - library/build* only: - - master + - dev library upload to Bintray: stage: release @@ -45,5 +45,5 @@ library upload to Bintray: dependencies: - library release build only: - - master + - dev when: manual From 9eb0bb79851ae54c3c7b77e1a0bde74e0999f5ba Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:37:09 +0200 Subject: [PATCH 08/11] Updated CI script --- .gitlab-ci.yml | 6 +++--- library/build.gradle | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e74c762..484d513 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -22,7 +22,7 @@ debug build: script: - ./gradlew assembleDebug except: - - dev + - master library release build: stage: build @@ -34,7 +34,7 @@ library release build: paths: - library/build* only: - - dev + - master library upload to Bintray: stage: release @@ -45,5 +45,5 @@ library upload to Bintray: dependencies: - library release build only: - - dev + - master when: manual diff --git a/library/build.gradle b/library/build.gradle index e1ed98f..24dc857 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -56,6 +56,7 @@ task androidSourcesJar(type: Jar) { bintray { dryRun = false + publish = true override = true Properties properties = new Properties() From fbecb6b59ce42f0d2a0df6b619e8bbba00f7f2db Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:38:18 +0200 Subject: [PATCH 09/11] Publish config refactor --- library/build.gradle | 75 ++------------------------------------------ publish.gradle | 71 +++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 73 deletions(-) create mode 100644 publish.gradle diff --git a/library/build.gradle b/library/build.gradle index 24dc857..51c69aa 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -5,8 +5,6 @@ apply plugin: 'maven-publish' apply plugin: 'com.github.dcendents.android-maven' apply plugin: "com.jfrog.bintray" -apply from: '../testformatter.gradle' - ext { PUBLISH_GROUP_ID = 'co.zsmb' PUBLISH_ARTIFACT_ID = 'materialdrawer-kt' @@ -38,74 +36,5 @@ dependencies { implementation "com.android.support:design:$support_lib_version" } -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 - - Properties properties = new Properties() - - def localPropsFile = project.rootProject.file('local.properties') - if (localPropsFile.exists()) { - properties.load(localPropsFile.newDataInputStream()) - } - - user = properties.getProperty('bintrayUser') ?: System.getenv('BINTRAY_USER') - key = properties.getProperty('bintrayKey') ?: System.getenv('BINTRAY_API_KEY') - - publications('release') - - pkg { - repo = "MaterialDrawerKt" - name = "MaterialDrawerKt" - vcsUrl = "https://gitlab.com/zsmb/MaterialDrawerKt" - - publicDownloadNumbers = true - licenses = ["Apache-2.0"] - version { - name = PUBLISH_VERSION - vcsTag = PUBLISH_VERSION - released = new Date() - } - } - - publishing { - publications { - release(MavenPublication) { - groupId PUBLISH_GROUP_ID - artifactId PUBLISH_ARTIFACT_ID - version PUBLISH_VERSION - artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") - artifact androidSourcesJar - artifact androidJavadocsJar - - pom.withXml { - def dependenciesNode = asNode().appendNode('dependencies') - - project.configurations.implementation.allDependencies.each { - def dependencyNode = dependenciesNode.appendNode('dependency') - dependencyNode.appendNode('groupId', it.group) - dependencyNode.appendNode('artifactId', it.name) - dependencyNode.appendNode('version', it.version) - } - } - } - } - } -} +apply from: '../testformatter.gradle' +apply from: '../publish.gradle' diff --git a/publish.gradle b/publish.gradle new file mode 100644 index 0000000..86ba936 --- /dev/null +++ b/publish.gradle @@ -0,0 +1,71 @@ +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 + + Properties properties = new Properties() + + def localPropsFile = project.rootProject.file('local.properties') + if (localPropsFile.exists()) { + properties.load(localPropsFile.newDataInputStream()) + } + + user = properties.getProperty('bintrayUser') ?: System.getenv('BINTRAY_USER') + key = properties.getProperty('bintrayKey') ?: System.getenv('BINTRAY_API_KEY') + + publications('release') + + pkg { + repo = "MaterialDrawerKt" + name = "MaterialDrawerKt" + vcsUrl = "https://gitlab.com/zsmb/MaterialDrawerKt" + + publicDownloadNumbers = true + licenses = ["Apache-2.0"] + version { + name = PUBLISH_VERSION + vcsTag = PUBLISH_VERSION + released = new Date() + } + } + + publishing { + publications { + release(MavenPublication) { + groupId PUBLISH_GROUP_ID + artifactId PUBLISH_ARTIFACT_ID + version PUBLISH_VERSION + artifact("$buildDir/outputs/aar/${project.getName()}-release.aar") + artifact androidSourcesJar + artifact androidJavadocsJar + + pom.withXml { + def dependenciesNode = asNode().appendNode('dependencies') + + project.configurations.implementation.allDependencies.each { + def dependencyNode = dependenciesNode.appendNode('dependency') + dependencyNode.appendNode('groupId', it.group) + dependencyNode.appendNode('artifactId', it.name) + dependencyNode.appendNode('version', it.version) + } + } + } + } + } +} From 3ad049f9b3fb4caad5b94aa35000764a4daccc92 Mon Sep 17 00:00:00 2001 From: zsmb13 Date: Sun, 22 Jul 2018 19:46:00 +0200 Subject: [PATCH 10/11] Updated base library version to 6.0.9 --- library/build.gradle | 2 +- .../materialdrawerkt/draweritems/profile/ProfileDrawerItemKt.kt | 2 +- .../draweritems/profile/ProfileSettingDrawerItemKt.kt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/library/build.gradle b/library/build.gradle index 51c69aa..49ed3ca 100644 --- a/library/build.gradle +++ b/library/build.gradle @@ -27,7 +27,7 @@ android { dependencies { implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - api('com.mikepenz:materialdrawer:6.0.8@aar') { + api('com.mikepenz:materialdrawer:6.0.9@aar') { transitive = true } implementation "com.android.support:appcompat-v7:$support_lib_version" diff --git a/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileDrawerItemKt.kt b/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileDrawerItemKt.kt index 68be944..2e39530 100644 --- a/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileDrawerItemKt.kt +++ b/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileDrawerItemKt.kt @@ -185,7 +185,7 @@ public class ProfileDrawerItemKt : AbstractDrawerItemKt(Profi * * Non readable property. Wraps the [ProfileDrawerItem.withName] method. */ - public var name: String + public var name: CharSequence @Deprecated(level = DeprecationLevel.ERROR, message = "Non readable property.") get() = nonReadable() set(value) { diff --git a/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileSettingDrawerItemKt.kt b/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileSettingDrawerItemKt.kt index 7334b50..fd9e603 100644 --- a/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileSettingDrawerItemKt.kt +++ b/library/src/main/java/co/zsmb/materialdrawerkt/draweritems/profile/ProfileSettingDrawerItemKt.kt @@ -237,7 +237,7 @@ public class ProfileSettingDrawerItemKt : AbstractDrawerItemKt Date: Sun, 22 Jul 2018 19:46:17 +0200 Subject: [PATCH 11/11] Release 1.3.6 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index adb6777..6eefd8d 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ You can find the sample app [in the Play Store](https://play.google.com/store/ap The library is hosted on jcenter. To use it, add the following to your module level `build.gradle` file's dependencies: ```gradle -implementation 'co.zsmb:materialdrawer-kt:1.3.5' +implementation 'co.zsmb:materialdrawer-kt:1.3.6' // required support libraries implementation "com.android.support:appcompat-v7:${versions.supportLib}"