Merge pull request #23 from rubensousa/dev

2.0.0

.github/workflows/dev.yml

@@ -23,6 +23,6 @@ jobs:
       - name: Install Android SDK
         uses: malinskiy/action-android/install-sdk@release/0.1.0
       - name: Run unit tests
-        run: ./gradlew testDebugUnitTest --stacktrace -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew testDebugUnitTest --stacktrace
       - name: Assemble library
-        run: ./gradlew assembleRelease -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew assembleRelease

.github/workflows/master.yml

@@ -23,8 +23,6 @@ jobs:
       - name: Install Android SDK
         uses: malinskiy/action-android/install-sdk@release/0.1.0
       - name: Run unit tests
-        run: ./gradlew testDebugUnitTest --stacktrace -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew testDebugUnitTest --stacktrace
       - name: Assemble library
-        run: ./gradlew assembleRelease -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
-      - name: Release library
-        run: ./gradlew bintrayUpload -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew assembleRelease

.github/workflows/pull_requests.yml

@@ -23,6 +23,6 @@ jobs:
       - name: Install Android SDK
         uses: malinskiy/action-android/install-sdk@release/0.1.0
       - name: Run unit tests
-        run: ./gradlew testDebugUnitTest --stacktrace -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew testDebugUnitTest
       - name: Assemble library
-        run: ./gradlew assembleRelease -Pbintray_user=${{ secrets.BINTRAY_USER }} -Pbintray_apikey=${{ secrets.BINTRAY_KEY }}
+        run: ./gradlew assembleRelease

CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.0.0
+
+Changed artifact to: com.rubensousa:decorator
+
 # 1.3.1
 
 #### LinearMarginDecoration

README.md

@@ -9,7 +9,7 @@ Decorator is a library that helps creating composable margins and dividers in Re
 ## Install
 
 ```groovy
-implementation 'io.cabriole:decorator:x.x.x'
+implementation 'com.rubensousa:decorator:x.x.x'
 ```
 
 Replace x.x.x with the latest version available
@@ -188,7 +188,7 @@ decoration.setDecorationLookup(object : DecorationLookup {
 
 ## License
 
-    Copyright 2020 Cabriole
+    Copyright 2021 Rúben Sousa
 
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

decorator/gradle.properties

@@ -13,21 +13,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-LIBRARY_VERSION=1.3.1
-LIBRARY_GROUP=io.cabriole
+LIBRARY_VERSION=2.0.0
+LIBRARY_GROUP=com.rubensousa
 LIBRARY_ARTIFACT=decorator
 # POM info
 POM_PACKAGING=aar
 POM_NAME=Decorator
 POM_DESCRIPTION=A collection of ItemDecorations for RecyclerView
-POM_URL=https://github.com/cabriole/Decorator
-POM_SCM_URL=https://github.com/cabriole/Decorator
-POM_VCS_URL=https://github.com/cabriole/Decorator.git
-POM_SCM_CONNECTION=scm:git@github.com:cabriole/Decorator.git
-POM_SCM_DEV_CONNECTION=scm:git@github.com:cabriole/Decorator.git
-POM_DEVELOPER_ID=cabriole
-POM_DEVELOPER_NAME=Cabriole
-POM_LICENSE_NAME=The Apache Software License, Version 2.0
-POM_LICENSE_URL=http://www.apache.org/licenses/LICENSE-2.0.txt
-POM_LICENSE_DIST=repo
-POM_LICENSES=Apache-2.0
+POM_URL=https://github.com/rubensousa/Decorator/
+POM_SCM_URL=https://github.com/rubensousa/Decorator/
+POM_VCS_URL=https://github.com/rubensousa/Decorator.git
+POM_SCM_CONNECTION=scm:git@github.com:rubensousa/Decorator.git
+POM_SCM_DEV_CONNECTION=scm:git@github.com:rubensousa/Decorator.git
+POM_DEVELOPER_ID=rubensousa
+POM_DEVELOPER_NAME=Rúben Sousa

decorator/publish.gradle

@@ -104,8 +104,7 @@ buildscript {
 }
 
 apply plugin: 'maven-publish'
-apply plugin: 'com.jfrog.bintray'
-
+apply plugin: 'signing'
 
 def isDokkaAvailable = project.tasks.findByName('dokka')
 
@@ -115,6 +114,51 @@ if (isDokkaAvailable) {
     apply plugin: 'org.jetbrains.dokka'
 }
 
+ext["signing.keyId"] = getSecretKeyId()
+ext["signing.password"] = getSecretKeyPassword()
+ext["signing.secretKeyRingFile"] = getSecretKeyRingFilePath()
+
+String getSecretKeyPassword() {
+    if (hasProperty("ossrhSecretKeyPassword")) {
+        return ossrhSecretKeyPassword
+    } else {
+        return ""
+    }
+}
+
+String getSecretKeyId() {
+    if (hasProperty("ossrhSecretKeyId")) {
+        return ossrhSecretKeyId
+    } else {
+        return ""
+    }
+}
+
+String getSecretKeyRingFilePath() {
+    if (hasProperty("ossrhSecretKeyRingFile")) {
+        return ossrhSecretKeyRingFile
+    } else {
+        return ""
+    }
+}
+
+String getSonatypeUsername() {
+    if (hasProperty("ossrhUsername")) {
+        return ossrhUsername
+    } else {
+        return ""
+    }
+}
+
+String getSonatypePassword() {
+    if (hasProperty("ossrhPassword")) {
+        return ossrhPassword
+    } else {
+        return ""
+    }
+}
+
+
 afterEvaluate { project ->
 
     def publishSources = shouldPublishSources()
@@ -211,6 +255,17 @@ afterEvaluate { project ->
                 configurePom(pom)
             }
         }
+        repositories {
+            maven {
+                name = "sonatype"
+                url = "https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/"
+
+                credentials {
+                    username getSonatypeUsername()
+                    password getSonatypePassword()
+                }
+            }
+        }
     }
 }
 
@@ -242,13 +297,10 @@ def configurePom(pom) {
         developerConnection = POM_SCM_DEV_CONNECTION
     }
 
-    if (hasProperty('POM_LICENSE_NAME')) {
-        pom.licenses {
-            license {
-                name = POM_LICENSE_NAME
-                url = POM_LICENSE_URL
-                distribution = POM_LICENSE_DIST
-            }
+    pom.licenses {
+        license {
+            name = "The Apache Software License, Version 2.0"
+            url = "http://www.apache.org/licenses/LICENSE-2.0.txt"
         }
     }
 
@@ -263,24 +315,6 @@ def configurePom(pom) {
 group LIBRARY_GROUP
 version LIBRARY_VERSION
 
-bintray {
-    user = bintray_user
-    key = bintray_apikey
-    publications = ['release']
-    pkg {
-        repo = 'maven'
-        name = LIBRARY_ARTIFACT
-        desc = POM_DESCRIPTION
-        userOrg = 'cabriole'
-        description = POM_DESCRIPTION
-        publish = true
-        publicDownloadNumbers = true
-        licenses = POM_LICENSES.split(",")
-        vcsUrl = POM_VCS_URL
-        version {
-            name = this.version
-            released = new Date()
-            vcsTag = this.version
-        }
-    }
-}
+signing {
+    sign publishing.publications
+}

decorator/src/main/AndroidManifest.xml

@@ -1 +1 @@
-<manifest package="io.cabriole.decorator" />
+<manifest package="com.rubensousa.decorator" />

decorator/src/main/java/io/cabriole/decorator/AbstractMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/AbstractMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/ColumnProvider.kt → decorator/src/main/java/com/rubensousa/decorator/ColumnProvider.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 /**
  * Provides the number of fixed columns used by a LayoutManager

decorator/src/main/java/io/cabriole/decorator/DecorationLookup.kt → decorator/src/main/java/com/rubensousa/decorator/DecorationLookup.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 /**
  * Checks if a decoration should be applied for a given adapter position

decorator/src/main/java/io/cabriole/decorator/GridBoundsMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/GridBoundsMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/GridDividerDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/GridDividerDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Canvas
 import android.graphics.Paint

decorator/src/main/java/io/cabriole/decorator/GridMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/GridMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/GridSpanBoundsMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/GridSpanBoundsMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/GridSpanMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/GridSpanMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/LinearBoundsMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/LinearBoundsMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/LinearDividerDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/LinearDividerDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Canvas
 import android.graphics.Paint

decorator/src/main/java/io/cabriole/decorator/LinearMarginDecoration.kt → decorator/src/main/java/com/rubensousa/decorator/LinearMarginDecoration.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020. Cabriole
+ * Copyright (c) 2021. Rúben Sousa
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 import android.graphics.Rect
 import android.view.View

decorator/src/main/java/io/cabriole/decorator/MergeDecorationLookup.kt → decorator/src/main/java/com/rubensousa/decorator/MergeDecorationLookup.kt

@@ -1,4 +1,4 @@
-package io.cabriole.decorator
+package com.rubensousa.decorator
 
 /**
  * Allows combining multiple [DecorationLookup]