Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@ jobs:
with:
java-version: 11
- name: Start containers
run: docker-compose up -d
run: docker compose up -d
- name: Build and test
run: ./gradlew build
12 changes: 10 additions & 2 deletions .github/workflows/distribution.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,19 @@ jobs:
- uses: actions/setup-java@v1
with:
java-version: 11
- name: Build and publish to mavenCentral
- name: Build and publish to directory
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
run: ./gradlew publish -PlibraryPublish
run: ./gradlew jreleaserConfig build publish -PlibraryPublish
- name: Publish to Maven Central Repository
env:
OSSRH_USER: ${{ secrets.OSSRH_USER }}
OSSRH_KEY: ${{ secrets.OSSRH_KEY }}
SIGNING_KEY_ID: ${{ secrets.SIGNING_KEYID }}
SIGNING_PASSWORD: ${{ secrets.SIGNING_PASSWORD }}
SIGNING_KEY: ${{ secrets.GPG_KEY_CONTENTS }}
run: ./gradlew jreleaserFullRelease -PlibraryPublish
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ repositories {
}

// Append dependency
implementation("com.icerockdev:storage-service:0.8.0")
implementation("com.icerockdev:storage-service:0.9.0")
````

## Library usage
Expand Down
6 changes: 3 additions & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ allprojects {
maybeCreate("provided")
}

val copyLibsCompileTask = tasks.create("copyLibsCompile", Copy::class.java) {
val copyLibsCompileTask = tasks.register("copyLibsCompile", Copy::class.java) {
from(configurations["runtimeClasspath"])
into(File(project.rootDir, "build/libs"))
}
Expand All @@ -27,6 +27,6 @@ allprojects {
}
}

tasks.create("clean", Delete::class.java) {
delete(rootProject.buildDir)
tasks.register("clean", Delete::class.java) {
delete(rootProject.layout.buildDirectory)
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
43 changes: 30 additions & 13 deletions gradlew

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

37 changes: 21 additions & 16 deletions gradlew.bat

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

44 changes: 35 additions & 9 deletions storage-service/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
* Copyright 2020 IceRock MAG Inc. Use of this source code is governed by the Apache 2.0 license.
*/
import java.util.Base64
import org.jreleaser.model.Active

plugins {
id("org.jetbrains.kotlin.jvm")
id("kotlin-kapt")
id("maven-publish")
id("java-library")
id("signing")
id("org.jreleaser") version "1.18.0"
}

apply(plugin = "java")
apply(plugin = "kotlin")

group = "com.icerockdev"
version = "0.8.0"
version = "0.9.0"

val sourcesJar by tasks.registering(Jar::class) {
archiveClassifier.set("sources")
Expand Down Expand Up @@ -56,15 +58,9 @@ repositories {
mavenCentral()
}

val publishRepositoryName = "maven-central-portal-deploy"
publishing {
repositories.maven("https://s01.oss.sonatype.org/service/local/staging/deploy/maven2/") {
name = "OSSRH"

credentials {
username = System.getenv("OSSRH_USER")
password = System.getenv("OSSRH_KEY")
}
}
repositories.maven(layout.buildDirectory.dir(publishRepositoryName))
publications {
register("mavenJava", MavenPublication::class) {
from(components["java"])
Expand Down Expand Up @@ -126,3 +122,33 @@ publishing {
}
}
}

jreleaser {
gitRootSearch = true
release {
generic {
skipRelease = true
skipTag = true
changelog {
enabled = false
}
token = "EMPTY"
}
}
deploy {
maven {
mavenCentral.create("sonatype") {
enabled = !properties.containsKey("libraryPublishToMavenLocal")
applyMavenCentralRules = true
sign = false
active = Active.ALWAYS
url = "https://central.sonatype.com/api/v1/publisher"
stagingRepository(layout.buildDirectory.dir(publishRepositoryName).get().toString())
setAuthorization("Basic")
retryDelay = 60
username = System.getenv("OSSRH_USER")
password = System.getenv("OSSRH_KEY")
}
}
}
}