javax to jakarta

metaborg · Jul 24, 2024 · 609210e · 609210e
1 parent 174e40a
commit 609210e
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 19 deletions.
diff --git a/core/spoofax.compiler.eclipsebundle/build.gradle.kts b/core/spoofax.compiler.eclipsebundle/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     api(platform(project(":spoofax.depconstraints")))
     annotationProcessor(platform(project(":spoofax.depconstraints")))
 
-    bundleTargetPlatformApi(eclipse("javax.inject"))
+    bundleTargetPlatformApi(eclipse("jakarta.inject-api"))
 
     bundleApi(project(":spoofax.eclipse"))
     bundleApi(project(":tooling.eclipsebundle"))

diff --git a/core/spoofax.depconstraints/build.gradle.kts b/core/spoofax.depconstraints/build.gradle.kts
@@ -14,7 +14,7 @@ val spoofax2DevenvVersion: String by ext
 
 val picocliVersion = "4.5.0"
 
-val javaxInjectVersion = "1"
+val jakartaInjectVersion = "2.0.1"
 val checkerframeworkVersion = "3.16.0"
 
 val daggerVersion = "2.36" // Do not upgrade, causes Gradle/Kotlin compatibility issues due to upgrade to Kotlin 1.5.
@@ -101,8 +101,8 @@ dependencies {
         api("info.picocli:picocli-codegen:$picocliVersion")
 
         // Annotation-only dependencies
-        /// javax.inject
-        api("javax.inject:javax.inject:$javaxInjectVersion")
+        /// jakarta.inject
+        api("jakarta.inject:jakarta.inject-api:$jakartaInjectVersion")
         /// Checkerframework
         api("org.checkerframework:checker-qual-android:$checkerframeworkVersion") // Use android version: annotation retention policy is class instead of runtime.
         /// FindBugs JSR305

diff --git a/core/spoofax.eclipse/build.gradle.kts b/core/spoofax.eclipse/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     api(platform(project(":spoofax.depconstraints")))
     annotationProcessor(platform(project(":spoofax.depconstraints")))
 
-    bundleTargetPlatformApi(eclipse("javax.inject"))
+    bundleTargetPlatformApi(eclipse("jakarta.inject-api"))
     bundleTargetPlatformApi(eclipse("org.eclipse.core.runtime"))
     bundleTargetPlatformApi(eclipse("org.eclipse.core.expressions"))
     bundleTargetPlatformApi(eclipse("org.eclipse.core.resources"))

diff --git a/core/statix.multilang.eclipse/build.gradle.kts b/core/statix.multilang.eclipse/build.gradle.kts
@@ -7,7 +7,7 @@ dependencies {
     api(platform(project(":spoofax.depconstraints")))
     annotationProcessor(platform(project(":spoofax.depconstraints")))
 
-    bundleTargetPlatformApi(eclipse("javax.inject"))
+    bundleTargetPlatformApi(eclipse("jakarta.inject-api"))
     bundleTargetPlatformApi(eclipse("org.eclipse.core.runtime"))
     bundleTargetPlatformApi(eclipse("org.eclipse.core.expressions"))
     bundleTargetPlatformApi(eclipse("org.eclipse.core.resources"))
@@ -23,8 +23,8 @@ dependencies {
 
 // Use bnd to create a single OSGi bundle JAR that includes all dependencies.
 val exports = listOf(
-    // Provided by 'javax.inject' bundle.
-    "!javax.inject.*",
+    // Provided by 'jakarta.inject' bundle.
+    "!jakarta.inject.*",
     // Provided by 'spoofax.eclipse' bundle.
     "!mb.log.*",
     "!mb.resource.*",

diff --git a/core/stratego.pie/build.gradle.kts b/core/stratego.pie/build.gradle.kts
@@ -10,7 +10,7 @@ dependencies {
     api(project(":stratego.common"))
     api("org.metaborg:pie.api")
 
-    compileOnly("javax.inject:javax.inject")
+    compileOnly("jakarta.inject:jakarta.inject-api")
     compileOnly("org.checkerframework:checker-qual-android")
     compileOnly("org.derive4j:derive4j-annotation")
 

diff --git a/core/tooling.eclipsebundle/build.gradle.kts b/core/tooling.eclipsebundle/build.gradle.kts
@@ -11,7 +11,7 @@ dependencies {
     api(platform(project(":spoofax.depconstraints")))
     annotationProcessor(platform(project(":spoofax.depconstraints")))
 
-    bundleTargetPlatformApi(eclipse("javax.inject"))
+    bundleTargetPlatformApi(eclipse("jakarta.inject-api"))
 
     bundleApi(project(":spoofax.eclipse"))
 
@@ -40,8 +40,8 @@ dependencies {
 
 // Use bnd to create a single OSGi bundle JAR that includes all dependencies.
 val exportPackage = listOf(
-    // Provided by `javax.inject`
-    "!javax.inject.*",
+    // Provided by `jakarta.inject`
+    "!jakarta.inject.*",
     // Provided by `:spoofax.eclipse`
     "!mb.log.*",
     "!mb.resource.*",

diff --git a/example/tiger/manual/tiger.eclipse/build.gradle.kts b/example/tiger/manual/tiger.eclipse/build.gradle.kts
@@ -24,8 +24,8 @@ dependencies {
 
 // Use bnd to create a single OSGi bundle JAR that includes all dependencies.
 val exports = listOf(
-    // Provided by 'javax.inject' bundle.
-    "!javax.inject.*",
+    // Provided by 'jakarta.inject' bundle.
+    "!jakarta.inject.*",
     // Provided by 'spoofax.eclipse' bundle.
     "!mb.log.*",
     "!mb.resource.*",

diff --git a/lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts b/lwb.distrib/spoofax.lwb.eclipse/build.gradle.kts
@@ -14,7 +14,7 @@ dependencies {
     annotationProcessor(platform(compositeBuild("spoofax.depconstraints")))
 
 
-    bundleTargetPlatformApi(eclipse("javax.inject"))
+    bundleTargetPlatformApi(eclipse("jakarta.inject-api"))
     bundleTargetPlatformApi(eclipse("org.eclipse.jdt.core"))
 
 
@@ -51,8 +51,8 @@ dependencies {
         exclude("org.checkerframework", "checker-qual")
     }
 
-    // HACK: embed javax.inject as classgraph does not seem to pick up the above javax.inject dependency?
-    bundleEmbedImplementation("javax.inject:javax.inject:1")
+    // HACK: embed jakarta.inject as classgraph does not seem to pick up the above jakarta.inject dependency?
+    bundleEmbedImplementation("jakarta.inject:jakarta.inject-api:2.0.1")
 
     // Embed `:spoofax.lwb.dynamicloading`.
     bundleEmbedImplementation(compositeBuild("spoofax.lwb.dynamicloading")) {
@@ -130,8 +130,8 @@ val privatePackage = listOf(
     "mb.spoofax.lwb.*",
     // Embed `mb.spt.dynamicloading`
     "mb.spt.dynamicloading.*",
-    // Embed `javax.inject`
-    "javax.inject.*",
+    // Embed `jakarta.inject`
+    "jakarta.inject.*",
     // Embed `org.checkerframework:checker-qual-android`
     "org.checkerframework.*",
     // Embed `com.google.dagger:dagger-compiler` and dependencies. Allow split packages for `dagger.model`, as