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
7 changes: 4 additions & 3 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,10 @@ jobs:
run: ./gradlew -PRELEASE_SIGNING_ENABLED=false publishToMavenLocal build
- name: Publish the artifacts
env:
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_NEXUS_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_NEXUS_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.ARTIFACT_SIGNING_PRIVATE_KEY }}
ORG_GRADLE_PROJECT_mavenCentralUsername: ${{ secrets.SONATYPE_CENTRAL_USERNAME }}
ORG_GRADLE_PROJECT_mavenCentralPassword: ${{ secrets.SONATYPE_CENTRAL_PASSWORD }}
ORG_GRADLE_PROJECT_signingInMemoryKey: ${{ secrets.GPG_SECRET_KEY }}
ORG_GRADLE_PROJECT_signingInMemoryKeyPassword: ${{ secrets.GPG_SECRET_PASSPHRASE }}
run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-parallel --stacktrace

env:
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ POM_DEVELOPER_NAME=Square, Inc.
POM_DEVELOPER_URL=https://github.com/squareup/
SONATYPE_STAGING_PROFILE=com.squareup

SONATYPE_HOST=S01
SONATYPE_HOST=CENTRAL_PORTAL
RELEASE_SIGNING_ENABLED=true
SONATYPE_AUTOMATIC_RELEASE=true
8 changes: 4 additions & 4 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[versions]
kotlin = "1.8.20"
kotlin = "1.9.20"
kotlinDsl = "4.1.1"
dokka = "1.8.20"
dokka = "1.9.20"
kotlinx = "1.7.3"
kotlinSerialization = "1.5.1"
kotlinSerialization = "1.6.0"

gradleTAPI = "7.4.2"

Expand All @@ -21,7 +21,7 @@ koin = "3.3.0"

jgit = "6.4.0.202211300538-r"

vanniktech = "0.25.3"
vanniktech = "0.34.0"

[libraries]
# Plugins
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-all.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
Expand Down
3 changes: 1 addition & 2 deletions plugins/src/main/kotlin/com/squareup/plugins/Utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ import org.jetbrains.dokka.Platform
import org.jetbrains.dokka.gradle.DokkaPlugin
import org.jetbrains.dokka.gradle.DokkaTask
import org.jetbrains.kotlin.gradle.dsl.KotlinJvmProjectExtension
import org.jetbrains.kotlin.gradle.plugin.KotlinPlatformJvmPlugin
import org.jetbrains.kotlin.gradle.utils.notCompatibleWithConfigurationCacheCompat
import java.io.File

Expand Down Expand Up @@ -62,7 +61,7 @@ internal fun Project.configureDokka() {
}

internal fun Project.configureJVM() {
apply<KotlinPlatformJvmPlugin>()
plugins.apply("org.jetbrains.kotlin.jvm")

configure<JavaPluginExtension> {
sourceCompatibility = JavaVersion.VERSION_17
Expand Down
Loading