From ca6541683b602603804c61a4bc0f6fdc2cb9c924 Mon Sep 17 00:00:00 2001
From: Tagir Valeev <tagir.valeev@jetbrains.com>
Date: Fri, 27 Sep 2024 10:35:07 +0200
Subject: [PATCH] Cleanup after merge

---
 CHANGELOG.md                                  |  5 +++-
 .../jetbrains/annotations/NotNullByDefault.kt | 30 -------------------
 .../annotations/NotNullByDefault.java         |  1 +
 3 files changed, 5 insertions(+), 31 deletions(-)
 delete mode 100644 multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NotNullByDefault.kt
 rename {java-annotations/src/main => src/jvmMain}/java/org/jetbrains/annotations/NotNullByDefault.java (97%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2663f74..a58f626 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,11 +1,14 @@
 Changelog
 ===
 
+Version 26.0.0
+---
+* Added new experimental annotation: `@NotNullByDefault`
+
 Version 25.0.0
 ---
 * Added Kotlin Multiplatform artifact (multiplatform-annotations).
 * Removed Java 5 artifact.
-* Added new annotation: `@NotNullByDefault`
 
 Version 24.1.0
 ---
diff --git a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NotNullByDefault.kt b/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NotNullByDefault.kt
deleted file mode 100644
index f74887e..0000000
--- a/multiplatform-annotations/src/commonMain/kotlin/org/jetbrains/annotations/NotNullByDefault.kt
+++ /dev/null
@@ -1,30 +0,0 @@
-package org.jetbrains.annotations
-
-/**
- * A meta-annotation applicable to Java class or package, which means that the non-primitive types mentioned
- * in the following contexts are recursively not-null by default:
- *
- *  * Types of fields
- *  * Types of method parameters
- *  * Types of method return values
- *
- * Recursively not-null means that along with types themselves, the components of array types, the type arguments
- * of generic types and the upper bounds of wildcard types are also not-null.
- *
- *
- * The annotation has no effect on overridden method parameters and return values. In this case, the annotations
- * declared on the original method in the superclass or interface take place.
- *
- *
- * The annotation has no effect on newly declared type parameters and their bounds. Only instantiations of
- * type parameters are constrained.
- *
- *
- * The annotation has no effect on local variables.
- *
- * @since 25.0.0
- */
-@MustBeDocumented
-@Retention(AnnotationRetention.BINARY)
-@Target(AnnotationTarget.CLASS, AnnotationTarget.FILE)
-annotation class NotNullByDefault 
\ No newline at end of file
diff --git a/java-annotations/src/main/java/org/jetbrains/annotations/NotNullByDefault.java b/src/jvmMain/java/org/jetbrains/annotations/NotNullByDefault.java
similarity index 97%
rename from java-annotations/src/main/java/org/jetbrains/annotations/NotNullByDefault.java
rename to src/jvmMain/java/org/jetbrains/annotations/NotNullByDefault.java
index 692ba7b..24f8e39 100644
--- a/java-annotations/src/main/java/org/jetbrains/annotations/NotNullByDefault.java
+++ b/src/jvmMain/java/org/jetbrains/annotations/NotNullByDefault.java
@@ -27,5 +27,6 @@
 @Documented
 @Retention(RetentionPolicy.CLASS)
 @Target({ElementType.TYPE, ElementType.PACKAGE})
+@ApiStatus.Experimental
 public @interface NotNullByDefault {
 }