diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ea14aada4277baeaa3ef061fb8562bcd27445a9f..acf27cf1f728ff56f0c1fa42528776c167ea3be0 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,11 +7,13 @@ cache: before_script: - "export GRADLE_USER_HOME=$(pwd)/.gradle" + - "echo $SIGNING_secretKey | base64 -d > $GRADLE_USER_HOME/sonatype_upload.gpg" - "chmod +x ./gradlew" stages: - "build" - "test" + - "release" build: stage: "build" @@ -34,3 +36,13 @@ test: - "*/build/reports/*.xml" except: - "tags" + +release: + stage: "release" + script: + - "./gradlew publish" + artifacts: + paths: + - "*/build/libs/*" +# only: +# - "tags" diff --git a/build.gradle.kts b/build.gradle.kts index e28ee393ae0c8386d26499b35dad767286a6074a..77cb859d0cbd103953518af5bf0311461bcc149a 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -16,6 +16,7 @@ plugins { id("org.jetbrains.dokka") version "1.4.20" id("maven-publish") id("jacoco") + id("com.vanniktech.maven.publish") version "0.13.0" } repositories { @@ -71,62 +72,3 @@ tasks.withType<KotlinCompile> { ) } } - -tasks { - val sourcesJar by registering(Jar::class) { - dependsOn(JavaPlugin.CLASSES_TASK_NAME) - archiveClassifier.set("sources") - from(sourceSets["main"].allSource) - } - - val javadocJar by registering(Jar::class) { - dependsOn("dokkaJavadoc") - archiveClassifier.set("javadoc") - from(javadoc) - } - - artifacts { - archives(sourcesJar) - archives(javadocJar) - archives(jar) - } -} - -publishing { - publications { - register<MavenPublication>("mavenJava") { - from(components["java"]) - artifact(tasks["sourcesJar"]) - artifact(tasks["javadocJar"]) - - groupId = "de.justjanne" - artifactId = "kotlin-bitflags" - version = "0.1.0" - - pom.withXml { - asNode().apply { - appendNode("description", "Simple Bitflags for Kotlin") - appendNode("name", rootProject.name) - appendNode("url", "https://git.kuschku.de/justJanne/kotlin-bitflags") - appendNode("licenses").appendNode("license").apply { - appendNode("name", "Mozilla Public License Version 2.0") - appendNode("url", "https://www.mozilla.org/en-US/MPL/2.0/") - } - appendNode("developers").appendNode("developer").apply { - appendNode("name", "Janne Mareike Koschinski") - appendNode("email", "support@kuschku.de") - appendNode("organizationUrl", "https://kuschku.de/") - } - appendNode("scm").apply { - appendNode("connection", "scm:git:https://git.kuschku.de/justJanne/kotlin-bitflags.git") - appendNode("developerConnection", "scm:git:ssh://git.kuschku.de:2222/justJanne/kotlin-bitflags.git") - appendNode("url", "https://git.kuschku.de/justJanne/kotlin-bitflags") - } - appendNode("properties").apply { - appendNode("project.build.sourceEncoding", "UTF-8") - } - } - } - } - } -} diff --git a/gradle.properties b/gradle.properties index cb409ff69d88b04a8b0144ed933fb54244d74951..ad112f06c20833d1fd2c87e8b40396d48d5d46b1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,20 @@ kotlin.code.style=official junit5Version=5.6.0 + +GROUP=de.justjanne +VERSION_NAME=1.0.0-RC +POM_ARTIFACT_ID=kotlin-bitflags +POM_NAME=kotlin-bitflags +POM_DESCRIPTION=Simple Bitflags for Kotlin + +POM_URL=https://git.kuschku.de/justJanne/kotlin-bitflags +POM_SCM_URL=https://git.kuschku.de/justJanne/kotlin-bitflags +POM_SCM_CONNECTION=scm:git:https://git.kuschku.de/justJanne/kotlin-bitflags.git +POM_SCM_DEV_CONNECTION=scm:git:ssh://git.kuschku.de:2222/justJanne/kotlin-bitflags.git + +POM_LICENSE_NAME=Mozilla Public License Version 2.0 +POM_LICENSE_URL=https://www.mozilla.org/en-US/MPL/2.0/ +POM_LICENSE_DIST=repo + +POM_DEVELOPER_ID=justJanne +POM_DEVELOPER_NAME=Janne Mareike Koschinski