Skip to content

Commit b586d51

Browse files
stainless-app[bot]stainless-app[bot]
committed
feat(api): manual updates
1 parent b39e9dc commit b586d51

424 files changed

Lines changed: 2673 additions & 2689 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.github/workflows/publish-sonatype.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
export -- GPG_SIGNING_KEY_ID
3434
printenv -- GPG_SIGNING_KEY | gpg --batch --passphrase-fd 3 --import 3<<< "$GPG_SIGNING_PASSWORD"
3535
GPG_SIGNING_KEY_ID="$(gpg --with-colons --list-keys | awk -F : -- '/^pub:/ { getline; print "0x" substr($10, length($10) - 7) }')"
36-
./gradlew publish --no-configuration-cache
36+
./gradlew publishAndReleaseToMavenCentral --stacktrace -PmavenCentralUsername="$SONATYPE_USERNAME" -PmavenCentralPassword="$SONATYPE_PASSWORD" --no-configuration-cache
3737
env:
3838
SONATYPE_USERNAME: ${{ secrets.IMAGE_KIT_SONATYPE_USERNAME || secrets.SONATYPE_USERNAME }}
3939
SONATYPE_PASSWORD: ${{ secrets.IMAGE_KIT_SONATYPE_PASSWORD || secrets.SONATYPE_PASSWORD }}

‎.stats.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
configured_endpoints: 47
22
openapi_spec_url: https://storage.googleapis.com/stainless-sdk-openapi-specs/imagekit-inc%2Fimagekit-c7f578172392bde58bbb72be2a25b9e917529cd07550358c645ce155debf2418.yml
33
openapi_spec_hash: f0d797a17b1e8e81707517700cd44b13
4-
config_hash: 4fa07762cb363071cfdeef3f7eeec56e
4+
config_hash: ef918f7e878d4168a07e867607eb68ea

‎build.gradle.kts‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
plugins {
2-
id("io.github.gradle-nexus.publish-plugin") version "1.1.0"
32
id("org.jetbrains.dokka") version "2.0.0"
43
}
54

@@ -8,7 +7,7 @@ repositories {
87
}
98

109
allprojects {
11-
group = "com.imagekit.api"
10+
group = "io.imagekit.io"
1211
version = "0.0.1" // x-release-please-version
1312
}
1413

@@ -35,15 +34,3 @@ tasks.named("dokkaJavadocCollector").configure {
3534
.filter { it.project.name != "image-kit-java" && it.name == "dokkaJavadocJar" }
3635
.forEach { mustRunAfter(it) }
3736
}
38-
39-
nexusPublishing {
40-
repositories {
41-
sonatype {
42-
nexusUrl.set(uri("https://s01.oss.sonatype.org/service/local/"))
43-
snapshotRepositoryUrl.set(uri("https://s01.oss.sonatype.org/content/repositories/snapshots/"))
44-
45-
username.set(System.getenv("SONATYPE_USERNAME"))
46-
password.set(System.getenv("SONATYPE_PASSWORD"))
47-
}
48-
}
49-
}

‎buildSrc/build.gradle.kts‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,15 @@
11
plugins {
22
`kotlin-dsl`
33
kotlin("jvm") version "1.9.20"
4+
id("com.vanniktech.maven.publish") version "0.28.0"
45
}
56

67
repositories {
78
gradlePluginPortal()
9+
mavenCentral()
810
}
911

1012
dependencies {
1113
implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20")
14+
implementation("com.vanniktech:gradle-maven-publish-plugin:0.28.0")
1215
}

‎buildSrc/src/main/kotlin/image-kit.java.gradle.kts‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,6 @@ repositories {
88
mavenCentral()
99
}
1010

11-
configure<JavaPluginExtension> {
12-
withJavadocJar()
13-
withSourcesJar()
14-
}
15-
1611
java {
1712
toolchain {
1813
languageVersion.set(JavaLanguageVersion.of(17))
@@ -27,10 +22,6 @@ tasks.withType<JavaCompile>().configureEach {
2722
options.release.set(8)
2823
}
2924

30-
tasks.named<Jar>("javadocJar") {
31-
setZip64(true)
32-
}
33-
3425
tasks.named<Jar>("jar") {
3526
manifest {
3627
attributes(mapOf(

‎buildSrc/src/main/kotlin/image-kit.publish.gradle.kts‎

Lines changed: 55 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,69 +1,72 @@
1+
import com.vanniktech.maven.publish.JavadocJar
2+
import com.vanniktech.maven.publish.KotlinJvm
3+
import com.vanniktech.maven.publish.MavenPublishBaseExtension
4+
import com.vanniktech.maven.publish.SonatypeHost
5+
16
plugins {
2-
`maven-publish`
3-
signing
7+
id("com.vanniktech.maven.publish")
8+
}
9+
10+
publishing {
11+
repositories {
12+
if (project.hasProperty("publishLocal")) {
13+
maven {
14+
name = "LocalFileSystem"
15+
url = uri("${rootProject.layout.buildDirectory.get()}/local-maven-repo")
16+
}
17+
}
18+
}
419
}
520

6-
configure<PublishingExtension> {
7-
publications {
8-
register<MavenPublication>("maven") {
9-
from(components["java"])
21+
repositories {
22+
gradlePluginPortal()
23+
mavenCentral()
24+
}
1025

11-
pom {
12-
name.set("ImageKit API")
13-
description.set("Checkout [API overview](/docs/api-overview) to learn about ImageKit's APIs,\nauthentication, rate limits, and error codes etc.")
14-
url.set("https://imagekit.io/docs/api-reference")
26+
extra["signingInMemoryKey"] = System.getenv("GPG_SIGNING_KEY")
27+
extra["signingInMemoryKeyId"] = System.getenv("GPG_SIGNING_KEY_ID")
28+
extra["signingInMemoryKeyPassword"] = System.getenv("GPG_SIGNING_PASSWORD")
1529

16-
licenses {
17-
license {
18-
name.set("Apache-2.0")
19-
}
20-
}
30+
configure<MavenPublishBaseExtension> {
31+
if (!project.hasProperty("publishLocal")) {
32+
signAllPublications()
33+
publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL)
34+
}
2135

22-
developers {
23-
developer {
24-
name.set("Image Kit")
25-
email.set("developer@imagekit.io")
26-
}
27-
}
36+
coordinates(project.group.toString(), project.name, project.version.toString())
37+
configure(
38+
KotlinJvm(
39+
javadocJar = JavadocJar.Dokka("dokkaJavadoc"),
40+
sourcesJar = true,
41+
)
42+
)
2843

29-
scm {
30-
connection.set("scm:git:git://github.com/imagekit-developer/imagekit-java.git")
31-
developerConnection.set("scm:git:git://github.com/imagekit-developer/imagekit-java.git")
32-
url.set("https://github.com/imagekit-developer/imagekit-java")
33-
}
44+
pom {
45+
name.set("ImageKit API")
46+
description.set("Checkout [API overview](/docs/api-overview) to learn about ImageKit's APIs,\nauthentication, rate limits, and error codes etc.")
47+
url.set("https://imagekit.io/docs/api-reference")
3448

35-
versionMapping {
36-
allVariants {
37-
fromResolutionResult()
38-
}
39-
}
49+
licenses {
50+
license {
51+
name.set("Apache-2.0")
4052
}
4153
}
42-
}
43-
repositories {
44-
if (project.hasProperty("publishLocal")) {
45-
maven {
46-
name = "LocalFileSystem"
47-
url = uri("${rootProject.layout.buildDirectory.get()}/local-maven-repo")
54+
55+
developers {
56+
developer {
57+
name.set("Image Kit")
58+
email.set("developer@imagekit.io")
4859
}
4960
}
50-
}
51-
}
5261

53-
signing {
54-
val signingKeyId = System.getenv("GPG_SIGNING_KEY_ID")?.ifBlank { null }
55-
val signingKey = System.getenv("GPG_SIGNING_KEY")?.ifBlank { null }
56-
val signingPassword = System.getenv("GPG_SIGNING_PASSWORD")?.ifBlank { null }
57-
if (signingKey != null && signingPassword != null) {
58-
useInMemoryPgpKeys(
59-
signingKeyId,
60-
signingKey,
61-
signingPassword,
62-
)
63-
sign(publishing.publications["maven"])
62+
scm {
63+
connection.set("scm:git:git://github.com/imagekit-developer/imagekit-java.git")
64+
developerConnection.set("scm:git:git://github.com/imagekit-developer/imagekit-java.git")
65+
url.set("https://github.com/imagekit-developer/imagekit-java")
66+
}
6467
}
6568
}
6669

67-
tasks.named("publish") {
68-
dependsOn(":closeAndReleaseSonatypeStagingRepository")
70+
tasks.withType<Zip>().configureEach {
71+
isZip64 = true
6972
}

image-kit-java-client-okhttp/src/main/kotlin/com/imagekit/api/client/okhttp/ImageKitOkHttpClient.kt renamed to image-kit-java-client-okhttp/src/main/kotlin/io/imagekit/io/client/okhttp/ImageKitOkHttpClient.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// File generated from our OpenAPI spec by Stainless.
22

3-
package com.imagekit.api.client.okhttp
3+
package io.imagekit.io.client.okhttp
44

55
import com.fasterxml.jackson.databind.json.JsonMapper
6-
import com.imagekit.api.client.ImageKitClient
7-
import com.imagekit.api.client.ImageKitClientImpl
8-
import com.imagekit.api.core.ClientOptions
9-
import com.imagekit.api.core.Sleeper
10-
import com.imagekit.api.core.Timeout
11-
import com.imagekit.api.core.http.Headers
12-
import com.imagekit.api.core.http.HttpClient
13-
import com.imagekit.api.core.http.QueryParams
14-
import com.imagekit.api.core.jsonMapper
6+
import io.imagekit.io.client.ImageKitClient
7+
import io.imagekit.io.client.ImageKitClientImpl
8+
import io.imagekit.io.core.ClientOptions
9+
import io.imagekit.io.core.Sleeper
10+
import io.imagekit.io.core.Timeout
11+
import io.imagekit.io.core.http.Headers
12+
import io.imagekit.io.core.http.HttpClient
13+
import io.imagekit.io.core.http.QueryParams
14+
import io.imagekit.io.core.jsonMapper
1515
import java.net.Proxy
1616
import java.time.Clock
1717
import java.time.Duration
@@ -179,7 +179,7 @@ class ImageKitOkHttpClient private constructor() {
179179
/**
180180
* The Jackson JSON mapper to use for serializing and deserializing JSON.
181181
*
182-
* Defaults to [com.imagekit.api.core.jsonMapper]. The default is usually sufficient and
182+
* Defaults to [io.imagekit.io.core.jsonMapper]. The default is usually sufficient and
183183
* rarely needs to be overridden.
184184
*/
185185
fun jsonMapper(jsonMapper: JsonMapper) = apply { clientOptions.jsonMapper(jsonMapper) }

image-kit-java-client-okhttp/src/main/kotlin/com/imagekit/api/client/okhttp/ImageKitOkHttpClientAsync.kt renamed to image-kit-java-client-okhttp/src/main/kotlin/io/imagekit/io/client/okhttp/ImageKitOkHttpClientAsync.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
// File generated from our OpenAPI spec by Stainless.
22

3-
package com.imagekit.api.client.okhttp
3+
package io.imagekit.io.client.okhttp
44

55
import com.fasterxml.jackson.databind.json.JsonMapper
6-
import com.imagekit.api.client.ImageKitClientAsync
7-
import com.imagekit.api.client.ImageKitClientAsyncImpl
8-
import com.imagekit.api.core.ClientOptions
9-
import com.imagekit.api.core.Sleeper
10-
import com.imagekit.api.core.Timeout
11-
import com.imagekit.api.core.http.Headers
12-
import com.imagekit.api.core.http.HttpClient
13-
import com.imagekit.api.core.http.QueryParams
14-
import com.imagekit.api.core.jsonMapper
6+
import io.imagekit.io.client.ImageKitClientAsync
7+
import io.imagekit.io.client.ImageKitClientAsyncImpl
8+
import io.imagekit.io.core.ClientOptions
9+
import io.imagekit.io.core.Sleeper
10+
import io.imagekit.io.core.Timeout
11+
import io.imagekit.io.core.http.Headers
12+
import io.imagekit.io.core.http.HttpClient
13+
import io.imagekit.io.core.http.QueryParams
14+
import io.imagekit.io.core.jsonMapper
1515
import java.net.Proxy
1616
import java.time.Clock
1717
import java.time.Duration
@@ -179,7 +179,7 @@ class ImageKitOkHttpClientAsync private constructor() {
179179
/**
180180
* The Jackson JSON mapper to use for serializing and deserializing JSON.
181181
*
182-
* Defaults to [com.imagekit.api.core.jsonMapper]. The default is usually sufficient and
182+
* Defaults to [io.imagekit.io.core.jsonMapper]. The default is usually sufficient and
183183
* rarely needs to be overridden.
184184
*/
185185
fun jsonMapper(jsonMapper: JsonMapper) = apply { clientOptions.jsonMapper(jsonMapper) }

image-kit-java-client-okhttp/src/main/kotlin/com/imagekit/api/client/okhttp/OkHttpClient.kt renamed to image-kit-java-client-okhttp/src/main/kotlin/io/imagekit/io/client/okhttp/OkHttpClient.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
1-
package com.imagekit.api.client.okhttp
2-
3-
import com.imagekit.api.core.RequestOptions
4-
import com.imagekit.api.core.Timeout
5-
import com.imagekit.api.core.http.Headers
6-
import com.imagekit.api.core.http.HttpClient
7-
import com.imagekit.api.core.http.HttpMethod
8-
import com.imagekit.api.core.http.HttpRequest
9-
import com.imagekit.api.core.http.HttpRequestBody
10-
import com.imagekit.api.core.http.HttpResponse
11-
import com.imagekit.api.errors.ImageKitIoException
1+
package io.imagekit.io.client.okhttp
2+
3+
import io.imagekit.io.core.RequestOptions
4+
import io.imagekit.io.core.Timeout
5+
import io.imagekit.io.core.http.Headers
6+
import io.imagekit.io.core.http.HttpClient
7+
import io.imagekit.io.core.http.HttpMethod
8+
import io.imagekit.io.core.http.HttpRequest
9+
import io.imagekit.io.core.http.HttpRequestBody
10+
import io.imagekit.io.core.http.HttpResponse
11+
import io.imagekit.io.errors.ImageKitIoException
1212
import java.io.IOException
1313
import java.io.InputStream
1414
import java.net.Proxy

image-kit-java-client-okhttp/src/test/kotlin/com/imagekit/api/client/okhttp/OkHttpClientTest.kt renamed to image-kit-java-client-okhttp/src/test/kotlin/io/imagekit/io/client/okhttp/OkHttpClientTest.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
package com.imagekit.api.client.okhttp
1+
package io.imagekit.io.client.okhttp
22

33
import com.github.tomakehurst.wiremock.client.WireMock.*
44
import com.github.tomakehurst.wiremock.junit5.WireMockRuntimeInfo
55
import com.github.tomakehurst.wiremock.junit5.WireMockTest
6-
import com.imagekit.api.core.http.HttpMethod
7-
import com.imagekit.api.core.http.HttpRequest
6+
import io.imagekit.io.core.http.HttpMethod
7+
import io.imagekit.io.core.http.HttpRequest
88
import org.assertj.core.api.Assertions.assertThat
99
import org.junit.jupiter.api.BeforeEach
1010
import org.junit.jupiter.api.Test

0 commit comments

Comments
 (0)