Browse Source

Upgrade to AspectJ 1.9.8

This commit also upgades the dedicated Gradle plugin for AspectJ build
integration.

Closes gh-27416
pull/28041/head
Brian Clozel 3 years ago
parent
commit
2019e176ee
  1. 4
      build.gradle
  2. 2
      gradle/toolchains.gradle

4
build.gradle

@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
plugins {
id 'io.spring.dependency-management' version '1.0.11.RELEASE' apply false
id 'io.spring.nohttp' version '0.0.10'
id "io.freefair.aspectj" version '6.3.0' apply false
id "io.freefair.aspectj" version '6.4.0' apply false
id 'org.jetbrains.dokka' version '1.6.0' apply false
id 'org.jetbrains.kotlin.jvm' version '1.6.10' apply false
id "org.jetbrains.kotlin.plugin.serialization" version '1.6.10' apply false
@ -51,7 +51,7 @@ configure(allprojects) { project -> @@ -51,7 +51,7 @@ configure(allprojects) { project ->
}
dependency "com.google.code.findbugs:jsr305:3.0.2"
dependencySet(group: 'org.aspectj', version: '1.9.8.RC3') {
dependencySet(group: 'org.aspectj', version: '1.9.8') {
entry 'aspectjrt'
entry 'aspectjtools'
entry 'aspectjweaver'

2
gradle/toolchains.gradle

@ -118,7 +118,7 @@ pluginManager.withPlugin("kotlin") { @@ -118,7 +118,7 @@ pluginManager.withPlugin("kotlin") {
}
}
else {
// Fallback to JDK11
// Fallback to JDK17
compileKotlin {
kotlinOptions {
jvmTarget = '1.8'

Loading…
Cancel
Save