Merge remote-tracking branch 'origin/master'

Author: ArAkAru

.github/workflows/pull-request.yml

@@ -2,6 +2,8 @@ name: On pull request
 
 on: [ pull_request ]
 
+concurrency: pull-request
+
 jobs:
   build:
 
@@ -18,18 +20,8 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'adopt'
-          server-id: github
-          settings-path: ${{ github.workspace }}
-
-      - name: Enqueue concurrent workflows runs
-        uses: softprops/turnstyle@v1
-        with:
-          abort-after-seconds: 1800
-          poll-interval-seconds: 30
-          same-branch-only: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          distribution: 'corretto'
+          cache: 'gradle'
 
       - name: Build, run tests and upload dev snapshot to Maven Central with Gradle
         run: ./gradlew devSnapshot printDevSnapshotReleaseNote

.github/workflows/push-to-master.yml

@@ -5,6 +5,8 @@ on:
     branches:
       - master
 
+concurrency: push-to-master
+
 jobs:
   build:
 
@@ -21,20 +23,11 @@ jobs:
         uses: actions/setup-java@v3
         with:
           java-version: '17'
-          distribution: 'adopt'
-          server-id: github
-
-      - name: Enqueue concurrent workflows runs
-        uses: softprops/turnstyle@v1
-        with:
-          abort-after-seconds: 1800
-          poll-interval-seconds: 30
-          same-branch-only: false
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          distribution: 'corretto'
+          cache: 'gradle'
 
       - name: Build, upload release version to Maven Central and create git release tag with Gradle
-        run: ./gradlew detekt final closeRepository releaseRepository printFinalReleaseNote
+        run: ./gradlew detekt final closeAndReleaseStagingRepository printFinalReleaseNote
         env:
           GPG_SIGNING_KEY: ${{ secrets.GPG_SIGNING_KEY }}
           GPG_SIGNING_PASSWORD: ${{ secrets.GPG_SIGNING_PASSWORD }}

.gitignore

@@ -3,6 +3,7 @@
 !.idea/codeStyles/codeStyleConfig.xml
 build/
 out/
+*.iml
 
 src/test/resources/test.properties
 

README.md

@@ -15,6 +15,26 @@ apiHost=app.local.ecwid.com
 apiPort=8443
 ```
 
+#### Adding the Library to a Maven Project
+
+To add the current library to a Maven project, you need to add the following block of code to your project's `pom.xml` file inside the `<dependencies>` tag:
+
+```xml
+<dependency>
+    <groupId>com.ecwid.apiclient</groupId>
+    <artifactId>api-client</artifactId>
+    <version>0.326.0</version>
+</dependency>
+```
+
+#### Adding the Library to a Gradle Project
+
+To add the current library to a Gradle project using Kotlin DSL, you need to add the following line to your project's `build.gradle.kts` file inside the `dependencies` block:
+
+```kotlin
+implementation("com.ecwid.apiclient:api-client:0.326.0")
+```
+
 ## Examples
 
 #### Simple example:
@@ -25,7 +45,7 @@ val apiClient = ApiClient.create(
 				storeId = 1003,
 				apiToken = "secret_mysecuretoken"),
 		httpTransport = ApacheCommonsHttpClientTransport(),
-		jsonTransformerProvider = GsonTransformerProvider()
+		jsonTransformerProvider = GsonTransformerProvider())
 
 val customer = apiClient.getCustomerDetails(CustomerDetailsRequest(customerId = 1))
 println("api/v3 customer: $customer")
@@ -39,7 +59,7 @@ val apiClient = ApiClient.create(
 				storeId = 1003,
 				apiToken = "secret_mysecuretoken"),
 		httpTransport = ApacheCommonsHttpClientTransport(),
-		jsonTransformerProvider = GsonTransformerProvider()
+		jsonTransformerProvider = GsonTransformerProvider())
 
 val requestsForBatch = listOf(CustomerDetailsRequest(1), CustomerDetailsRequest(2))
 val batch = apiClient.createBatch(CreateBatchRequest(requestsForBatch, stopOnFirstFailure = true))
@@ -57,6 +77,6 @@ while (true) {
 			.map { it.toTypedResponse(FetchedCustomer::class.java) }
 			.mapNotNull { if (it !is TypedBatchResponse.Ok<FetchedCustomer>) it.toString() else null }
 	println("api/v3 customers: ${customers.joinToString { it.id.toString() }}, errors: ${errors.joinToString()}")
-	break;
+	break
 }
 ```

build.gradle.kts

@@ -7,13 +7,13 @@ import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 plugins {
 	java
 	signing
-	kotlin("jvm") version "1.8.10"
+	kotlin("jvm") version "1.9.23"
 	id("com.adarshr.test-logger") version "3.2.0"
-	id("io.codearte.nexus-staging") version "0.30.0"
 	id("nebula.release") version "17.1.0"
 	id("maven-publish")
-	id("io.gitlab.arturbosch.detekt") version "1.22.0"
-	id("org.gradle.test-retry") version "1.4.1"
+	id("io.github.gradle-nexus.publish-plugin") version "1.3.0"
+	id("io.gitlab.arturbosch.detekt") version "1.23.4"
+	id("org.gradle.test-retry") version "1.5.2"
 }
 
 repositories {
@@ -26,13 +26,14 @@ dependencies {
 
 	api("com.google.code.gson:gson:2.10")
 	api("org.apache.httpcomponents:httpclient:4.5.13")
-	api("io.prometheus:simpleclient:0.16.0")
+	api("io.prometheus:prometheus-metrics-core:1.1.0")
 
+	testImplementation(kotlin("test"))
 	testImplementation("org.junit.jupiter:junit-jupiter:5.9.1")
 	testImplementation("org.reflections:reflections:0.10.2")
 	testImplementation("uk.co.jemos.podam:podam:7.2.11.RELEASE")
 
-	detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.22.0")
+	detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.4")
 }
 
 configure<JavaPluginConvention> {
@@ -70,6 +71,7 @@ tasks.withType<Detekt>().configureEach {
 
 val settingsProvider = SettingsProvider()
 
+
 tasks {
 	// All checks were already made by workflow "On pull request" => no checks here
 	if (gradle.startParameter.taskNames.contains("final")) {
@@ -78,16 +80,15 @@ tasks {
 		}
 	}
 
-	// Publish artifacts to Maven Central before pushing new git tag to repo
-	named("release").get().apply {
-		dependsOn(named("publish").get())
-	}
+	afterEvaluate {
+		// Publish artifacts to Maven Central before pushing new git tag to repo
+		named("release").get().apply {
+			dependsOn(named("publishToSonatype").get())
+		}
 
-	named("closeRepository").get().apply {
-		dependsOn(named("final").get())
-	}
-	named("releaseRepository").get().apply {
-		dependsOn(named("final").get())
+		named("closeAndReleaseStagingRepository").get().apply {
+			dependsOn(named("final").get())
+		}
 	}
 }
 
@@ -186,30 +187,23 @@ publishing {
 			}
 		}
 	}
-	repositories {
-		maven {
-			credentials {
-				username = settingsProvider.ossrhUsername
-				password = settingsProvider.ossrhPassword
-			}
-			url = if (project.isSnapshotVersion()) {
-				uri("https://oss.sonatype.org/content/repositories/snapshots/")
-			} else {
-				uri("https://oss.sonatype.org/service/local/staging/deploy/maven2/")
-			}
-		}
-	}
 }
 
 signing {
 	useInMemoryPgpKeys(settingsProvider.gpgSigningKey, settingsProvider.gpgSigningPassword)
 	sign(publishing.publications["mavenJava"])
 }
 
-nexusStaging {
-	packageGroup = PublicationSettings.STAGING_PACKAGE_GROUP
-	username = settingsProvider.ossrhUsername
-	password = settingsProvider.ossrhPassword
+nexusPublishing {
+	repositories {
+		sonatype {
+			useStaging.set(!project.isSnapshotVersion())
+			packageGroup.set(PublicationSettings.STAGING_PACKAGE_GROUP)
+			stagingProfileId.set(PublicationSettings.STAGING_PROFILE_ID)
+			username.set(settingsProvider.ossrhUsername)
+			password.set(settingsProvider.ossrhPassword)
+		}
+	}
 }
 
 // We want to change SNAPSHOT versions format from:
@@ -298,12 +292,16 @@ class SettingsProvider {
 
 	fun validateGPGSecrets() = require(
 		value = !gpgSigningKey.isNullOrBlank() && !gpgSigningPassword.isNullOrBlank(),
-		lazyMessage = { "Both $GPG_SIGNING_KEY_PROPERTY and $GPG_SIGNING_PASSWORD_PROPERTY environment variables must not be empty" }
+		lazyMessage = {
+			"Both $GPG_SIGNING_KEY_PROPERTY and $GPG_SIGNING_PASSWORD_PROPERTY environment variables must not be empty"
+		}
 	)
 
 	fun validateOssrhCredentials() = require(
 		value = !ossrhUsername.isNullOrBlank() && !ossrhPassword.isNullOrBlank(),
-		lazyMessage = { "Both $OSSRH_USERNAME_PROPERTY and $OSSRH_PASSWORD_PROPERTY environment variables must not be empty" }
+		lazyMessage = {
+			"Both $OSSRH_USERNAME_PROPERTY and $OSSRH_PASSWORD_PROPERTY environment variables must not be empty"
+		}
 	)
 
 	companion object {
@@ -335,6 +333,7 @@ object PublicationSettings {
 	const val SCM_URL = "https://github.com/Ecwid/ecwid-java-api-client.git"
 
 	const val STAGING_PACKAGE_GROUP = "com.ecwid"
+	const val STAGING_PROFILE_ID = "42242535548c99"
 }
 
 object Consts {

config/detekt.yml

@@ -27,7 +27,7 @@ style:
   ThrowsCount:
     max: 5
   ReturnCount:
-    max: 5
+    max: 8
   UnnecessaryAbstractClass:
     excludes: [ '**/test/**' ]
   WildcardImport:

gradle/wrapper/gradle-wrapper.jar

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists