Skip to content

Commit

Permalink
💚Migrate from bintray to maven central
Browse files Browse the repository at this point in the history
  • Loading branch information
ohmae committed Feb 7, 2021
1 parent 7c862b1 commit d88c909
Show file tree
Hide file tree
Showing 7 changed files with 72 additions and 55 deletions.
24 changes: 18 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
[![GitHub release](https://img.shields.io/github/release/ohmae/color-chooser.svg)](https://github.com/ohmae/color-chooser/releases)
[![GitHub issues](https://img.shields.io/github/issues/ohmae/color-chooser.svg)](https://github.com/ohmae/color-chooser/issues)
[![GitHub closed issues](https://img.shields.io/github/issues-closed/ohmae/color-chooser.svg)](https://github.com/ohmae/color-chooser/issues?q=is%3Aissue+is%3Aclosed)
[![Maven Repository](https://img.shields.io/badge/maven-jcenter-brightgreen.svg)](https://bintray.com/ohmae/maven/net.mm2d.color-chooser)
[![Maven metadata URI](https://img.shields.io/maven-metadata/v/https/jcenter.bintray.com/net/mm2d/color-chooser/maven-metadata.xml.svg)](https://bintray.com/ohmae/maven/net.mm2d.color-chooser)
![Maven Central](https://img.shields.io/maven-central/v/net.mm2d.preference/color-chooser)

## ScreenShots

Expand All @@ -16,11 +15,11 @@

## How to use

*jCenter will close in May. I am currently considering migrating to another hosting service. Please wait.*
jCenter will close in May. In 0.2.4 moved to mavenCentral from jcenter.
Please note that the **groupID has changed**

Download from jCenter. Add dependencies, such as the following.

latest version: [![Maven metadata URI](https://img.shields.io/maven-metadata/v/https/jcenter.bintray.com/net/mm2d/color-chooser/maven-metadata.xml.svg)](https://bintray.com/ohmae/maven/net.mm2d.color-chooser)
Download from mavenCentral.
latest version: ![Maven Central](https://img.shields.io/maven-central/v/net.mm2d.preference/color-chooser)

```gradle
repositories {
Expand All @@ -31,6 +30,19 @@ dependencies {
}
```

Versions below 0.2.4 were distributed with jCenter.
However, jCenter will close and old versions are not migrated to mavenCentral.
If you need an older version, please use the Github Pages repository.

```gradle
repositories {
maven { url = URI("https://ohmae.github.com/maven") }
}
dependencies {
implementation 'net.mm2d:color-chooser:<version>'
}
```

To show dialog. On `FragmentActivity` or `Fragment`

```kotlin
Expand Down
1 change: 0 additions & 1 deletion build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ buildscript {
classpath("org.jetbrains.dokka:dokka-gradle-plugin:1.4.20")
classpath("androidx.navigation:navigation-safe-args-gradle-plugin:2.3.3")

classpath("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
classpath("com.github.ben-manes:gradle-versions-plugin:0.36.0")
}
}
Expand Down
1 change: 0 additions & 1 deletion buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,5 @@ repositories {
dependencies {
implementation(kotlin("stdlib"))
implementation("com.android.tools.build:gradle:4.1.2")
implementation("com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5")
implementation("com.github.ben-manes:gradle-versions-plugin:0.36.0")
}
42 changes: 0 additions & 42 deletions buildSrc/src/main/java/build/Bintray.kt

This file was deleted.

8 changes: 6 additions & 2 deletions buildSrc/src/main/java/build/ProjectProperties.kt
Original file line number Diff line number Diff line change
@@ -1,11 +1,15 @@
package build

object ProjectProperties {
const val groupId: String = "net.mm2d"
const val groupId: String = "net.mm2d.color-chooser"
const val name: String = "color chooser"
const val description: String = "Color chooser dialog library for android"
const val developerId: String = "ryo"
const val developerName: String = "ryosuke"

private const val versionMajor: Int = 0
private const val versionMinor: Int = 2
private const val versionPatch: Int = 3
private const val versionPatch: Int = 4
const val versionName: String = "$versionMajor.$versionMinor.$versionPatch"
const val versionCode: Int = versionMajor * 10000 + versionMinor * 100 + versionPatch

Expand Down
33 changes: 32 additions & 1 deletion buildSrc/src/main/java/build/Publishing.kt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import org.gradle.kotlin.dsl.create
import org.gradle.kotlin.dsl.get
import org.gradle.kotlin.dsl.getPluginByName
import org.gradle.kotlin.dsl.named
import org.gradle.plugins.signing.SigningExtension
import java.net.URI

private fun Project.publishing(configure: PublishingExtension.() -> Unit): Unit =
(this as ExtensionAware).extensions.configure("publishing", configure)
Expand All @@ -28,22 +30,36 @@ private val NamedDomainObjectContainer<Configuration>.api: NamedDomainObjectProv
private val NamedDomainObjectContainer<Configuration>.implementation: NamedDomainObjectProvider<Configuration>
get() = named<Configuration>("implementation")

fun Project.signing(configure: SigningExtension.() -> Unit): Unit =
(this as ExtensionAware).extensions.configure("signing", configure)

val Project.publishing: PublishingExtension
get() = (this as ExtensionAware).extensions.getByName("publishing") as PublishingExtension

fun Project.publishingSettings() {
publishing {
publications {
create<MavenPublication>("bintray") {
create<MavenPublication>("mavenJava") {
artifact("$buildDir/outputs/aar/${base.archivesBaseName}-release.aar")
artifact(tasks["sourcesJar"])
artifact(tasks["javadocJar"])
groupId = ProjectProperties.groupId
artifactId = base.archivesBaseName
version = ProjectProperties.versionName
pom.withXml {
val node = asNode()
node.appendNode("name", ProjectProperties.name)
node.appendNode("description", ProjectProperties.description)
node.appendNode("url", ProjectProperties.Url.site)
node.appendNode("licenses").appendNode("license").apply {
appendNode("name", "The MIT License")
appendNode("url", "https://opensource.org/licenses/MIT")
appendNode("distribution", "repo")
}
node.appendNode("developers").appendNode("developer").apply {
appendNode("id", ProjectProperties.developerId)
appendNode("name", ProjectProperties.developerName)
}
node.appendNode("scm").apply {
appendNode("connection", ProjectProperties.Url.scm)
appendNode("developerConnection", ProjectProperties.Url.scm)
Expand Down Expand Up @@ -71,6 +87,21 @@ fun Project.publishingSettings() {
}
}
}
repositories {
maven {
url = URI("https://oss.sonatype.org/service/local/staging/deploy/maven2")
credentials {
username = project.findProperty("sonatype_username") as? String ?: ""
password = project.findProperty("sonatype_password") as? String ?: ""
}
}
}
signing {
sign(publishing.publications["mavenJava"])
}
}
tasks.named("publish") {
dependsOn("assemble")
}
}

Expand Down
18 changes: 16 additions & 2 deletions lib/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ plugins {
id("kotlin-android")
maven
`maven-publish`
signing
id("org.jetbrains.dokka")
id("com.jfrog.bintray")
id("com.github.ben-manes.versions")
}

Expand Down Expand Up @@ -60,6 +60,21 @@ tasks.named<DokkaTask>("dokkaHtml") {
}
}

tasks.named<DokkaTask>("dokkaJavadoc") {
outputDirectory.set(File(buildDir, "docs/javadoc"))
dokkaSourceSets {
configureEach {
moduleName.set("color-chooser")
}
}
}

tasks.create("javadocJar", Jar::class) {
dependsOn("dokkaJavadoc")
archiveClassifier.set("javadoc")
from(File(buildDir, "docs/javadoc"))
}

tasks.create("sourcesJar", Jar::class) {
archiveClassifier.set("sources")
from(android.sourceSets["main"].java.srcDirs)
Expand All @@ -71,5 +86,4 @@ artifacts {

uploadArchivesSettings()
publishingSettings()
bintraySettings()
dependencyUpdatesSettings()

0 comments on commit d88c909

Please sign in to comment.