diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e64353d64..8ce223eba 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -80,7 +80,7 @@ jobs: # Use "oldest" available ubuntu-* instead of -latest, # see https://docs.github.com/en/actions/using-github-hosted-runners/about-github-hosted-runners/about-github-hosted-runners#standard-github-hosted-runners-for-public-repositories; # due to https://github.com/google/google-java-format/issues/1072. - os: [ubuntu-20.04, macos-latest, windows-latest] + os: [ubuntu-22.04, macos-latest, windows-latest] runs-on: ${{ matrix.os }} continue-on-error: true steps: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 5fdbf183e..1639d1e94 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -36,7 +36,7 @@ jobs: java-version: 21 distribution: "zulu" cache: "maven" - server-id: sonatype-nexus-staging + server-id: central server-username: CI_DEPLOY_USERNAME server-password: CI_DEPLOY_PASSWORD gpg-private-key: ${{ secrets.GPG_SIGNING_KEY }} diff --git a/core/pom.xml b/core/pom.xml index 5b6bbb4d7..74ccbef0f 100644 --- a/core/pom.xml +++ b/core/pom.xml @@ -22,7 +22,7 @@ com.google.googlejavaformat google-java-format-parent - HEAD-SNAPSHOT + 1.28.0 google-java-format diff --git a/eclipse_plugin/META-INF/MANIFEST.MF b/eclipse_plugin/META-INF/MANIFEST.MF index 913245393..76dafbafb 100644 --- a/eclipse_plugin/META-INF/MANIFEST.MF +++ b/eclipse_plugin/META-INF/MANIFEST.MF @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2 Bundle-Name: google-java-format Bundle-SymbolicName: google-java-format-eclipse-plugin;singleton:=true Bundle-Vendor: Google -Bundle-Version: 1.13.0 +Bundle-Version: 1.28.0 Bundle-RequiredExecutionEnvironment: JavaSE-11 Require-Bundle: org.eclipse.jdt.core;bundle-version="3.10.0", org.eclipse.jface, diff --git a/eclipse_plugin/pom.xml b/eclipse_plugin/pom.xml index b2c6e368a..b8a8cb80b 100644 --- a/eclipse_plugin/pom.xml +++ b/eclipse_plugin/pom.xml @@ -22,7 +22,7 @@ com.google.googlejavaformat google-java-format-eclipse-plugin eclipse-plugin - 1.13.0 + 1.28.0 Google Java Format Plugin for Eclipse 4.5+ diff --git a/idea_plugin/build.gradle.kts b/idea_plugin/build.gradle.kts index 760a8b94c..f2d2c2200 100644 --- a/idea_plugin/build.gradle.kts +++ b/idea_plugin/build.gradle.kts @@ -18,7 +18,7 @@ import org.jetbrains.intellij.platform.gradle.TestFrameworkType // https://github.com/JetBrains/intellij-platform-gradle-plugin/releases plugins { - id("org.jetbrains.intellij.platform") version "2.4.0" + id("org.jetbrains.intellij.platform") version "2.5.0" } repositories { @@ -30,7 +30,7 @@ repositories { } // https://github.com/google/google-java-format/releases -val googleJavaFormatVersion = "1.26.0" +val googleJavaFormatVersion = "1.27.0" java { sourceCompatibility = JavaVersion.VERSION_17 @@ -81,7 +81,6 @@ dependencies { intellijPlatform { intellijIdeaCommunity("2022.3") bundledPlugin("com.intellij.java") - instrumentationTools() testFramework(TestFrameworkType.Plugin.Java) } implementation("com.google.googlejavaformat:google-java-format:${googleJavaFormatVersion}") diff --git a/idea_plugin/src/main/resources/META-INF/plugin.xml b/idea_plugin/src/main/resources/META-INF/plugin.xml index 28e6d3e35..404f59dbf 100644 --- a/idea_plugin/src/main/resources/META-INF/plugin.xml +++ b/idea_plugin/src/main/resources/META-INF/plugin.xml @@ -35,6 +35,8 @@ ]]> +
1.27.0.0
+
Updated to use google-java-format 1.27.0.
1.26.0.0
Updated to use google-java-format 1.26.0.
1.25.2.0
diff --git a/pom.xml b/pom.xml index 46ccad473..49ae459ff 100644 --- a/pom.xml +++ b/pom.xml @@ -23,7 +23,7 @@ com.google.googlejavaformat google-java-format-parent pom - HEAD-SNAPSHOT + 1.28.0 core @@ -94,6 +94,7 @@ 1.0.1 3.6.3 3.2.1 + 0.8.0 @@ -301,14 +302,8 @@ sonatype-nexus-snapshots - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots/ + https://central.sonatype.com/repository/maven-snapshots/ - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2/ - @@ -316,6 +311,15 @@ sonatype-oss-release + + org.sonatype.central + central-publishing-maven-plugin + ${central-publishing-maven-plugin.version} + true + + central + + org.apache.maven.plugins maven-source-plugin