Merge pull request #946 from simple-robot/bump-jb-annotation

bump(deps): Jetbrains annotation from 24.1.0 to 25.0.0

Author: ForteScarlet

gradle/libs.versions.toml

@@ -29,7 +29,7 @@ gradleNexusPublishPlugin = "2.0.0"
 
 [libraries]
 # jetbrains-annotation
-jetbrains-annotations = "org.jetbrains:annotations:24.1.0"
+jetbrains-annotations = "org.jetbrains:annotations:25.0.0"
 
 # gradle-nexus:publish-plugin
 gradleNexusPublishPlugin = { module = "io.github.gradle-nexus:publish-plugin", version.ref = "gradleNexusPublishPlugin" }

simbot-api/build.gradle.kts

@@ -73,6 +73,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
+                implementation(libs.jetbrains.annotations)
                 implementation(project(":simbot-commons:simbot-common-annotations"))
                 implementation(project(":simbot-logger"))
 
@@ -101,9 +102,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-                compileOnly(libs.jetbrains.annotations)
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
-
                 compileOnly(libs.kotlinx.coroutines.reactive)
                 compileOnly(libs.kotlinx.coroutines.reactor)
                 compileOnly(libs.kotlinx.coroutines.rx2)

simbot-commons/simbot-common-core/build.gradle.kts

@@ -83,7 +83,6 @@ kotlin {
         }
 
         jvmMain.dependencies {
-            compileOnly(project(":simbot-commons:simbot-common-annotations"))
             compileOnly(libs.kotlinx.coroutines.reactor)
             compileOnly(libs.kotlinx.coroutines.reactive)
         }

simbot-commons/simbot-common-suspend-runner/build.gradle.kts

@@ -69,7 +69,6 @@ kotlin {
         }
 
         jvmMain.dependencies {
-            compileOnly(project(":simbot-commons:simbot-common-annotations"))
             compileOnly(libs.kotlinx.coroutines.reactor)
             compileOnly(libs.kotlinx.coroutines.rx2)
             compileOnly(libs.kotlinx.coroutines.rx3)

simbot-cores/simbot-core-spring-boot-starter-common/build.gradle.kts

@@ -37,7 +37,7 @@ kotlin {
 }
 
 dependencies {
-    compileOnly(project(":simbot-commons:simbot-common-annotations"))
+    implementation(project(":simbot-commons:simbot-common-annotations"))
     api(project(":simbot-quantcat:simbot-quantcat-common"))
     api(project(":simbot-cores:simbot-core"))
 

simbot-cores/simbot-core-spring-boot-starter-v2/build.gradle.kts

@@ -40,7 +40,7 @@ kotlin {
 @Suppress("VulnerableLibrariesLocal")
 dependencies {
     implementation(project(":simbot-logger"))
-    compileOnly(project(":simbot-commons:simbot-common-annotations"))
+    implementation(project(":simbot-commons:simbot-common-annotations"))
     api(project(":simbot-quantcat:simbot-quantcat-common"))
     api(project(":simbot-cores:simbot-core"))
     api(project(":simbot-cores:simbot-core-spring-boot-starter-common"))

simbot-cores/simbot-core-spring-boot-starter/build.gradle.kts

@@ -42,7 +42,7 @@ dependencies {
     implementation(platform(libs.spring.boot.v3.dependencies))
     implementation(project(":simbot-logger"))
 
-    compileOnly(project(":simbot-commons:simbot-common-annotations"))
+    implementation(project(":simbot-commons:simbot-common-annotations"))
     api(project(":simbot-quantcat:simbot-quantcat-common"))
     api(project(":simbot-cores:simbot-core"))
     api(project(":simbot-cores:simbot-core-spring-boot-starter-common"))

simbot-cores/simbot-core/build.gradle.kts

@@ -82,11 +82,6 @@ kotlin {
             }
         }
 
-        jvmMain.dependencies {
-            compileOnly(project(":simbot-commons:simbot-common-annotations"))
-            // compileOnly(project(":simbot-commons:simbot-common-collection"))
-        }
-
         jvmTest {
             dependencies {
                 implementation(project(":simbot-api"))

simbot-extensions/simbot-extension-continuous-session/build.gradle.kts

@@ -56,6 +56,7 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
+                implementation(project(":simbot-commons:simbot-common-annotations"))
                 api(project(":simbot-api"))
             }
         }
@@ -71,8 +72,6 @@ kotlin {
 
         jvmMain {
             dependencies {
-
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
                 compileOnly(libs.kotlinx.coroutines.reactive)
                 compileOnly(libs.kotlinx.coroutines.reactor)
                 compileOnly(libs.kotlinx.coroutines.rx2)

simbot-quantcat/simbot-quantcat-annotations/build.gradle.kts

@@ -96,8 +96,7 @@ kotlin {
         commonMain {
             dependencies {
                 compileOnly(project(":simbot-api"))
-                // compileOnly(libs.suspend.reversal.annotations)
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
+                implementation(project(":simbot-commons:simbot-common-annotations"))
                 compileOnly(project(":simbot-quantcat:simbot-quantcat-common"))
             }
         }

simbot-quantcat/simbot-quantcat-common/build.gradle.kts

@@ -94,7 +94,6 @@ kotlin {
         }
 
         jvmMain.dependencies {
-            compileOnly(project(":simbot-commons:simbot-common-annotations"))
             compileOnly(kotlin("reflect"))
         }
 

simbot-test/build.gradle.kts

@@ -68,9 +68,8 @@ kotlin {
     sourceSets {
         commonMain {
             dependencies {
-                // jvm compile only
-                compileOnly(libs.jetbrains.annotations)
-                compileOnly(project(":simbot-commons:simbot-common-annotations"))
+                implementation(libs.jetbrains.annotations)
+                implementation(project(":simbot-commons:simbot-common-annotations"))
                 api(project(":simbot-api"))
 
                 // suspend reversal annotations
@@ -110,12 +109,6 @@ kotlin {
             }
         }
 
-        jsMain.dependencies {
-            implementation(project(":simbot-commons:simbot-common-annotations"))
-            implementation(libs.jetbrains.annotations)
-            // implementation(libs.suspend.reversal.annotations)
-        }
-
         jsTest.dependencies {
             implementation(libs.ktor.client.js)
             implementation(libs.ktor.client.core)