Skip to content

Commit

Permalink
Update dagger, add jakarta inject annotation dep
Browse files Browse the repository at this point in the history
  • Loading branch information
Apanatshka committed Jul 29, 2024
1 parent d278c88 commit b3b4b94
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
4 changes: 3 additions & 1 deletion core/spoofax.depconstraints/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,10 @@ 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.
val daggerVersion = "2.41" // Do not upgrade, causes Gradle/Kotlin compatibility issues due to upgrade to Kotlin 1.5.
val derive4jVersion = "1.1.1"
val immutablesVersion = "2.10.1"

Expand Down Expand Up @@ -103,6 +104,7 @@ dependencies {
// Annotation-only dependencies
/// javax.inject
api("javax.inject:javax.inject:$javaxInjectVersion")
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
Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# These properties are only used when this repository is built stand-alone, outside of devenv.
org.gradle.jvmargs=-Xms512M -Xmx4G -Xss8M
systemProp.spoofax2Version=2.5.21
systemProp.spoofax2DevenvVersion=0.1.36
systemProp.spoofax2DevenvVersion=0.1.41
1 change: 1 addition & 0 deletions lwb/metalang/stratego/stratego/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ dependencies {

// Required because @Nullable has runtime retention (which includes classfile retention), and the Java compiler requires access to it.
compileOnly("com.google.code.findbugs:jsr305")
compileOnly("jakarta.inject:jakarta.inject-api")

implementation("commons-io:commons-io")

Expand Down

0 comments on commit b3b4b94

Please sign in to comment.