Remove sonatype methods deprecated in 3.2.0

Author: jpenilla

build.gradle

@@ -90,7 +90,7 @@ subprojects {
           importOrderFile rootProject.file('.spotless/kyori.importorder')
           trimTrailingWhitespace()
           endWithNewline()
-          indentWithSpaces(2)
+          leadingTabsToSpaces(2)
         }
       }
     }

indra-common/src/main/java/net/kyori/indra/internal/SonatypeRepositoriesImpl.java

@@ -47,24 +47,6 @@ public MavenArtifactRepository snapshots() {
     });
   }
 
-  @Override
-  public MavenArtifactRepository ossSnapshots() {
-    return this.repositories.maven(repo -> {
-      repo.setName("sonatypeSnapshots");
-      repo.setUrl("https://oss.sonatype.org/content/repositories/snapshots/");
-      repo.mavenContent(MavenRepositoryContentDescriptor::snapshotsOnly);
-    });
-  }
-
-  @Override
-  public MavenArtifactRepository snapshotsOn(final int host) {
-    return this.repositories.maven(repo -> {
-      repo.setName("sonatypeSnapshots");
-      repo.setUrl(formatOssHost(host));
-      repo.mavenContent(MavenRepositoryContentDescriptor::snapshotsOnly);
-    });
-  }
-
   static String formatOssHost(final int host) {
     if (host < 1) {
       throw new IllegalArgumentException("Only hosts numbered >= 1 are supported, but " + host + " was provided");

indra-common/src/main/java/net/kyori/indra/repository/SonatypeRepositories.java

@@ -43,45 +43,4 @@ public interface SonatypeRepositories {
    * @since 3.2.0
    */
   MavenArtifactRepository snapshots();
-
-  /**
-   * Add the Sonatype OSS snapshot repository to this project.
-   *
-   * <p>The URL for this repository is {@literal https://oss.sonatype.org/content/repositories/snapshots/}.</p>
-   *
-   * @return the created repository
-   * @since 2.1.0
-   * @deprecated replaced by {@link #snapshots()} due to the new Central publishing system
-   */
-  @Deprecated
-  MavenArtifactRepository ossSnapshots();
-
-  /**
-   * Add the new Sonatype OSS snapshot repository to this project.
-   *
-   * <p>The URL for this repository is {@literal https://s01.oss.sonatype.org/content/repositories/snapshots/}.</p>
-   *
-   * @return the created repository
-   * @since 2.1.0
-   * @deprecated replaced by {@link #snapshots()} due to the new Central publishing system
-   */
-  @Deprecated
-  default MavenArtifactRepository s01Snapshots() {
-    return this.snapshotsOn(1);
-  }
-
-  /**
-   * Add a specific numbered Sonatype OSS snapshots host to this project.
-   *
-   * <p>The URL for this repository is {@code https://s<host>.oss.sonatype.org/content/repositories/snapshots/}.</p>
-   *
-   * <p>As of this writing, only one host exists -- {@code s01}.</p>
-   *
-   * @param host the host number
-   * @return the created repository
-   * @since 2.1.0
-   * @deprecated replaced by {@link #snapshots()} due to the new Central publishing system
-   */
-  @Deprecated
-  MavenArtifactRepository snapshotsOn(int host);
 }

indra-common/src/test/resources/net/kyori/indra/javac8Build/in/build.gradle

@@ -6,8 +6,7 @@ group 'com.example'
 version '1.0.0-SNAPSHOT'
 
 repositories {
-  sonatype.ossSnapshots()
-  sonatype.s01Snapshots()
+  sonatype.snapshots()
 }
 
 indra {

indra-common/src/test/resources/net/kyori/indra/kotlinBuildscript/in/build.gradle.kts

@@ -6,7 +6,7 @@ group = "com.example"
 version = "1.0.0-SNAPSHOT"
 
 repositories {
-  sonatype.ossSnapshots()
+  sonatype.snapshots()
 }
 
 sourceSets {

indra-common/src/test/resources/net/kyori/indra/simpleBuild/in/build.gradle

@@ -6,8 +6,7 @@ group 'com.example'
 version '1.0.0-SNAPSHOT'
 
 repositories {
-  sonatype.ossSnapshots()
-  sonatype.s01Snapshots()
+  sonatype.snapshots()
 }
 
 indra {
@@ -16,4 +15,4 @@ indra {
     publishing true
   }
   mitLicense()
-}
+}

indra-publishing-sonatype/src/main/java/net/kyori/indra/sonatype/IndraSonatypePublishingExtension.java

@@ -29,13 +29,5 @@
  * @since 2.0.0
  */
 public interface IndraSonatypePublishingExtension {
-  /**
-   * Use an alternate host for the Sonatype OSSRH.
-   *
-   * @param name the prefix to use -- for example, to use {@code s01.oss.sonatype.org}, the name should be {@code s01}
-   * @since 2.0.0
-   * @deprecated No longer relevant with the new Central publishing system
-   */
-  @Deprecated
-  void useAlternateSonatypeOSSHost(final String name);
+
 }

indra-publishing-sonatype/src/main/java/net/kyori/indra/sonatype/internal/IndraSonatypePublishingExtensionImpl.java

@@ -24,39 +24,12 @@
 package net.kyori.indra.sonatype.internal;
 
 import io.github.gradlenexus.publishplugin.NexusPublishExtension;
-import io.github.gradlenexus.publishplugin.NexusRepository;
-import java.net.URI;
 import javax.inject.Inject;
 import net.kyori.indra.sonatype.IndraSonatypePublishingExtension;
 
 public class IndraSonatypePublishingExtensionImpl implements IndraSonatypePublishingExtension {
-  private static final String SONATYPE_REPO = "sonatype";
-
-  private final NexusPublishExtension nexusExtension;
 
   @Inject
   public IndraSonatypePublishingExtensionImpl(final NexusPublishExtension nexusExtension) {
-    this.nexusExtension = nexusExtension;
-  }
-
-  @Deprecated
-  @Override
-  public void useAlternateSonatypeOSSHost(final String name) {
-    final NexusRepository repo = this.nexusExtension.getRepositories().maybeCreate(SONATYPE_REPO);
-
-    repo.getNexusUrl().set(this.nexusUrl(name));
-    repo.getSnapshotRepositoryUrl().set(this.snapshotUrl(name));
-  }
-
-  private String domain(final String prefix) {
-    return String.format("https://%soss.sonatype.org/", prefix == null || prefix.isEmpty() ? "" : prefix + '.');
-  }
-
-  private URI nexusUrl(final String prefix) {
-    return URI.create(this.domain(prefix) + "service/local/");
-  }
-
-  private URI snapshotUrl(final String prefix) {
-    return URI.create(this.domain(prefix) + "content/repositories/snapshots/");
   }
 }