Skip to content

Commit

Permalink
Build with Java 11. Compiler warnings due to deprecated API usage not…
Browse files Browse the repository at this point in the history
… cleaned up yet
  • Loading branch information
bobbylight committed Nov 21, 2024
1 parent 0e9d8d3 commit b4870e6
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Set up JDK 8
- name: Set up JDK 11
uses: actions/setup-java@v4
with:
java-version: '8'
java-version: '11'
distribution: 'temurin'

# Initializes the CodeQL tools for scanning.
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ jobs:

strategy:
matrix:
java: [ '8', '11', '17', '21']
java: ['11', '17', '21']

steps:
- uses: actions/checkout@v4
Expand Down
7 changes: 5 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,11 @@ all unit tests, and create the jar, run:

./gradlew build --warning-mode all

RSTA 3.0 and newer requires Java 8 to compile and run. If you need
Java 6 compatibility, you'll need to use a 2.6.x version.
RSTA 4.0 and newer requires Java 11 to compile and run. If you need
to support older Java versions:

* RSTA 3.x requires Java 8
* RSTA 2.6.x supports Java 6

# Demos

Expand Down
4 changes: 2 additions & 2 deletions RSyntaxTextArea/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ import static org.gradle.api.JavaVersion.*

['base', 'jacoco', 'biz.aQute.bnd.builder', 'distribution', 'maven-publish', 'signing'].each { apply plugin: it }

// We require building with JDK 8 or later. We turn off doclint since our
// We require building with JDK 11 or later. We turn off doclint since our
// generated *TokenMakers have horrible documentation (see https://github.com/jflex-de/jflex/issues/182)
assert current().isJava8Compatible()
assert current().isJava11Compatible()
allprojects {
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ plugins {
}

group 'com.fifesoft'
// NOTE: Local Java 8: /Library/Java/JavaVirtualMachines/jdk1.8.0_191.jdk/Contents/Home
// NOTE: Local Java 11: /Library/Java/JavaVirtualMachines/jdk-11.0.1.jdk/Contents/Home

allprojects {

Expand Down
5 changes: 4 additions & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Note that Maven- and signing-related properties are in <maven-home>/gradle.properties

# This controls source- and target-compatibility.
# Our builds require Java 11+, but still built artifacts compatible with Java 8.
javaVersion=1.8
version=3.5.3-SNAPSHOT
version=4.0.0-SNAPSHOT

# Ugh, see https://github.com/gradle/gradle/issues/11308
systemProp.org.gradle.internal.publish.checksums.insecure=true

0 comments on commit b4870e6

Please sign in to comment.