Revert back to the intended name

mpgirro · Mar 17, 2021 · d2504fc · d2504fc
1 parent b18b69c
commit d2504fc
Show file tree

Hide file tree

Showing 76 changed files with 196 additions and 196 deletions.
diff --git a/api/stalla.api b/api/stalla.api
@@ -1551,6 +1551,6 @@ public final class dev/stalla/parser/DateParser$sam$i$java_time_temporal_Tempora
 public abstract interface annotation class dev/stalla/util/ExperimentalAPI : java/lang/annotation/Annotation {
 }
 
-public abstract interface annotation class dev/stalla/util/InternalAPI2 : java/lang/annotation/Annotation {
+public abstract interface annotation class dev/stalla/util/InternalAPI : java/lang/annotation/Annotation {
 }
 
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -78,7 +78,7 @@ detekt {
 }
 
 apiValidation {
-    nonPublicMarkers.add("dev.stalla.util.InternalAPI2")
+    nonPublicMarkers.add("dev.stalla.util.InternalAPI")
 }
 
 tasks {
@@ -88,7 +88,7 @@ tasks {
             freeCompilerArgs = listOf(
                 "-Xopt-in=kotlin.RequiresOptIn",
                 "-Xopt-in=kotlin.contracts.ExperimentalContracts",
-                "-Xopt-in=dev.stalla.util.InternalAPI2",
+                "-Xopt-in=dev.stalla.util.InternalAPI",
                 "-Xopt-in=dev.stalla.util.ExperimentalAPI"
             )
         }

diff --git a/src/main/kotlin/dev/stalla/builder/AtomPersonBuilderProvider.kt b/src/main/kotlin/dev/stalla/builder/AtomPersonBuilderProvider.kt
@@ -1,8 +1,8 @@
 package dev.stalla.builder
 
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal interface AtomPersonBuilderProvider {
 
     /** Creates an instance of [AtomPersonBuilder] to use with this builder. */

diff --git a/src/main/kotlin/dev/stalla/builder/LinkBuilderProvider.kt b/src/main/kotlin/dev/stalla/builder/LinkBuilderProvider.kt
@@ -1,8 +1,8 @@
 package dev.stalla.builder
 
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal interface LinkBuilderProvider {
 
     /** Creates an instance of [LinkBuilder] to use with this builder. */

diff --git a/src/main/kotlin/dev/stalla/builder/episode/ProvidingEpisodeBuilder.kt b/src/main/kotlin/dev/stalla/builder/episode/ProvidingEpisodeBuilder.kt
@@ -4,9 +4,9 @@ import dev.stalla.builder.AtomPersonBuilderProvider
 import dev.stalla.builder.HrefOnlyImageBuilder
 import dev.stalla.builder.LinkBuilderProvider
 import dev.stalla.builder.RssCategoryBuilder
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal interface ProvidingEpisodeBuilder : EpisodeBuilder, AtomPersonBuilderProvider, LinkBuilderProvider {
 
     /** Creates an instance of [EpisodeEnclosureBuilder] to use with this builder. */

diff --git a/src/main/kotlin/dev/stalla/builder/validating/ValidatingAtomBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/ValidatingAtomBuilder.kt
@@ -4,10 +4,10 @@ import dev.stalla.builder.AtomBuilder
 import dev.stalla.builder.AtomPersonBuilder
 import dev.stalla.builder.LinkBuilder
 import dev.stalla.model.atom.Atom
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingAtomBuilder : AtomBuilder {
 
     private var authorBuilders: MutableList<AtomPersonBuilder> = mutableListOf()

diff --git a/src/main/kotlin/dev/stalla/builder/validating/ValidatingAtomPersonBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/ValidatingAtomPersonBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating
 
 import dev.stalla.builder.AtomPersonBuilder
 import dev.stalla.model.atom.AtomPerson
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingAtomPersonBuilder : AtomPersonBuilder {
 
     private lateinit var nameValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/ValidatingHrefOnlyImageBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/ValidatingHrefOnlyImageBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating
 
 import dev.stalla.builder.HrefOnlyImageBuilder
 import dev.stalla.model.HrefOnlyImage
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingHrefOnlyImageBuilder : HrefOnlyImageBuilder {
 
     private lateinit var hrefValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/ValidatingLinkBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/ValidatingLinkBuilder.kt
@@ -3,9 +3,9 @@ package dev.stalla.builder.validating
 import dev.stalla.builder.LinkBuilder
 import dev.stalla.model.MediaType
 import dev.stalla.model.atom.Link
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingLinkBuilder : LinkBuilder {
 
     private lateinit var hrefValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/ValidatingRssCategoryBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/ValidatingRssCategoryBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating
 
 import dev.stalla.builder.RssCategoryBuilder
 import dev.stalla.model.rss.RssCategory
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingRssCategoryBuilder : RssCategoryBuilder {
 
     private lateinit var categoryValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/ValidatingRssImageBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/ValidatingRssImageBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating
 
 import dev.stalla.builder.RssImageBuilder
 import dev.stalla.model.rss.RssImage
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingRssImageBuilder : RssImageBuilder {
 
     private lateinit var urlValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeBitloveBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeBitloveBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating.episode
 
 import dev.stalla.builder.episode.EpisodeBitloveBuilder
 import dev.stalla.model.bitlove.Bitlove
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeBitloveBuilder : EpisodeBitloveBuilder {
 
     private lateinit var guidValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeBuilder.kt
@@ -25,11 +25,11 @@ import dev.stalla.builder.validating.ValidatingHrefOnlyImageBuilder
 import dev.stalla.builder.validating.ValidatingLinkBuilder
 import dev.stalla.builder.validating.ValidatingRssCategoryBuilder
 import dev.stalla.model.Episode
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 import java.time.temporal.TemporalAccessor
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeBuilder : ProvidingEpisodeBuilder {
 
     private lateinit var titleValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeContentBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeContentBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating.episode
 
 import dev.stalla.builder.episode.EpisodeContentBuilder
 import dev.stalla.model.content.Content
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeContentBuilder : EpisodeContentBuilder {
 
     private lateinit var encodedValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeEnclosureBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeEnclosureBuilder.kt
@@ -3,9 +3,9 @@ package dev.stalla.builder.validating.episode
 import dev.stalla.builder.episode.EpisodeEnclosureBuilder
 import dev.stalla.model.MediaType
 import dev.stalla.model.rss.Enclosure
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeEnclosureBuilder : EpisodeEnclosureBuilder {
 
     private lateinit var urlValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeGoogleplayBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeGoogleplayBuilder.kt
@@ -4,10 +4,10 @@ import dev.stalla.builder.HrefOnlyImageBuilder
 import dev.stalla.builder.episode.EpisodeGoogleplayBuilder
 import dev.stalla.model.googleplay.EpisodeGoogleplay
 import dev.stalla.model.googleplay.ExplicitType
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.anyNotNull
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeGoogleplayBuilder : EpisodeGoogleplayBuilder {
 
     private var author: String? = null

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeGuidBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeGuidBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating.episode
 
 import dev.stalla.builder.episode.EpisodeGuidBuilder
 import dev.stalla.model.rss.Guid
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeGuidBuilder : EpisodeGuidBuilder {
 
     private lateinit var text: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeItunesBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodeItunesBuilder.kt
@@ -5,10 +5,10 @@ import dev.stalla.builder.episode.EpisodeItunesBuilder
 import dev.stalla.model.StyledDuration
 import dev.stalla.model.itunes.EpisodeItunes
 import dev.stalla.model.itunes.EpisodeType
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.anyNotNull
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodeItunesBuilder : EpisodeItunesBuilder {
 
     private var title: String? = null

diff --git a/...main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexBuilder.kt b/...main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexBuilder.kt
@@ -5,10 +5,10 @@ import dev.stalla.builder.episode.EpisodePodcastindexChaptersBuilder
 import dev.stalla.builder.episode.EpisodePodcastindexSoundbiteBuilder
 import dev.stalla.builder.episode.EpisodePodcastindexTranscriptBuilder
 import dev.stalla.model.podcastindex.EpisodePodcastindex
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodePodcastindexBuilder : EpisodePodcastindexBuilder {
 
     private var chaptersBuilderValue: EpisodePodcastindexChaptersBuilder? = null

diff --git a/...lin/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexChaptersBuilder.kt b/...lin/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexChaptersBuilder.kt
@@ -3,9 +3,9 @@ package dev.stalla.builder.validating.episode
 import dev.stalla.builder.episode.EpisodePodcastindexChaptersBuilder
 import dev.stalla.model.MediaType
 import dev.stalla.model.podcastindex.Chapters
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodePodcastindexChaptersBuilder : EpisodePodcastindexChaptersBuilder {
 
     private lateinit var urlValue: String

diff --git a/...in/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexSoundbiteBuilder.kt b/...in/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexSoundbiteBuilder.kt
@@ -3,9 +3,9 @@ package dev.stalla.builder.validating.episode
 import dev.stalla.builder.episode.EpisodePodcastindexSoundbiteBuilder
 import dev.stalla.model.StyledDuration
 import dev.stalla.model.podcastindex.Soundbite
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodePodcastindexSoundbiteBuilder : EpisodePodcastindexSoundbiteBuilder {
 
     private lateinit var startTimeValue: StyledDuration.SecondsAndFraction

diff --git a/...n/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexTranscriptBuilder.kt b/...n/dev/stalla/builder/validating/episode/ValidatingEpisodePodcastindexTranscriptBuilder.kt
@@ -3,10 +3,10 @@ package dev.stalla.builder.validating.episode
 import dev.stalla.builder.episode.EpisodePodcastindexTranscriptBuilder
 import dev.stalla.model.podcastindex.Transcript
 import dev.stalla.model.podcastindex.TranscriptType
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import java.util.Locale
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodePodcastindexTranscriptBuilder : EpisodePodcastindexTranscriptBuilder {
 
     private lateinit var urlValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodePodloveBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/episode/ValidatingEpisodePodloveBuilder.kt
@@ -3,10 +3,10 @@ package dev.stalla.builder.validating.episode
 import dev.stalla.builder.episode.EpisodePodloveBuilder
 import dev.stalla.builder.episode.EpisodePodloveSimpleChapterBuilder
 import dev.stalla.model.podlove.EpisodePodlove
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodePodloveBuilder : EpisodePodloveBuilder {
 
     private var chapterBuilders: MutableList<EpisodePodloveSimpleChapterBuilder> = mutableListOf()

diff --git a/...lin/dev/stalla/builder/validating/episode/ValidatingEpisodePodloveSimpleChapterBuilder.kt b/...lin/dev/stalla/builder/validating/episode/ValidatingEpisodePodloveSimpleChapterBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating.episode
 
 import dev.stalla.builder.episode.EpisodePodloveSimpleChapterBuilder
 import dev.stalla.model.podlove.SimpleChapter
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingEpisodePodloveSimpleChapterBuilder : EpisodePodloveSimpleChapterBuilder {
 
     private lateinit var startValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastBuilder.kt
@@ -24,12 +24,12 @@ import dev.stalla.builder.validating.ValidatingLinkBuilder
 import dev.stalla.builder.validating.ValidatingRssCategoryBuilder
 import dev.stalla.builder.validating.ValidatingRssImageBuilder
 import dev.stalla.model.Podcast
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 import java.time.temporal.TemporalAccessor
 import java.util.Locale
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastBuilder : ProvidingPodcastBuilder {
 
     private lateinit var titleValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastFeedpressBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastFeedpressBuilder.kt
@@ -2,11 +2,11 @@ package dev.stalla.builder.validating.podcast
 
 import dev.stalla.builder.podcast.PodcastFeedpressBuilder
 import dev.stalla.model.feedpress.Feedpress
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.anyNotNull
 import java.util.Locale
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastFeedpressBuilder : PodcastFeedpressBuilder {
 
     private var newsletterId: String? = null

diff --git a/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastFyydBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastFyydBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating.podcast
 
 import dev.stalla.builder.podcast.PodcastFyydBuilder
 import dev.stalla.model.fyyd.Fyyd
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastFyydBuilder : PodcastFyydBuilder {
 
     private lateinit var verifyValue: String

diff --git a/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastGoogleplayBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastGoogleplayBuilder.kt
@@ -4,11 +4,11 @@ import dev.stalla.builder.HrefOnlyImageBuilder
 import dev.stalla.builder.podcast.PodcastGoogleplayBuilder
 import dev.stalla.model.googleplay.GoogleplayCategory
 import dev.stalla.model.googleplay.PodcastGoogleplay
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.anyNotNull
 import dev.stalla.util.asUnmodifiable
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastGoogleplayBuilder : PodcastGoogleplayBuilder {
 
     private var author: String? = null

diff --git a/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastItunesBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastItunesBuilder.kt
@@ -6,10 +6,10 @@ import dev.stalla.builder.podcast.PodcastItunesOwnerBuilder
 import dev.stalla.model.itunes.ItunesCategory
 import dev.stalla.model.itunes.PodcastItunes
 import dev.stalla.model.itunes.ShowType
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastItunesBuilder : PodcastItunesBuilder {
 
     private lateinit var imageBuilderValue: HrefOnlyImageBuilder

diff --git a/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastItunesOwnerBuilder.kt b/src/main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastItunesOwnerBuilder.kt
@@ -2,9 +2,9 @@ package dev.stalla.builder.validating.podcast
 
 import dev.stalla.builder.podcast.PodcastItunesOwnerBuilder
 import dev.stalla.model.itunes.ItunesOwner
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastItunesOwnerBuilder : PodcastItunesOwnerBuilder {
 
     private lateinit var nameValue: String

diff --git a/...main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastPodcastindexBuilder.kt b/...main/kotlin/dev/stalla/builder/validating/podcast/ValidatingPodcastPodcastindexBuilder.kt
@@ -4,10 +4,10 @@ import dev.stalla.builder.podcast.PodcastPodcastindexBuilder
 import dev.stalla.builder.podcast.PodcastPodcastindexFundingBuilder
 import dev.stalla.builder.podcast.PodcastPodcastindexLockedBuilder
 import dev.stalla.model.podcastindex.PodcastPodcastindex
-import dev.stalla.util.InternalAPI2
+import dev.stalla.util.InternalAPI
 import dev.stalla.util.asUnmodifiable
 
-@InternalAPI2
+@InternalAPI
 internal class ValidatingPodcastPodcastindexBuilder : PodcastPodcastindexBuilder {
 
     private lateinit var lockedBuilderValue: PodcastPodcastindexLockedBuilder