Skip to content

Commit 5ba9b1e

Browse files
anb0sanb0s
committed
feat: update to 2023 targets and JavaSE-17 and Tycho 2.7.5
closes #267 Signed-off-by: Andre Bossert <[email protected]>
1 parent d244a2a commit 5ba9b1e

13 files changed

+50
-18
lines changed

‎.github/workflows/build-release.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Set up JDK 11
17+
- name: Set up JDK
1818
uses: actions/setup-java@v2
1919
with:
20-
java-version: '11'
20+
java-version: '17'
2121
distribution: 'temurin'
2222
cache: maven
2323
- name: Build release for default platform

‎.github/workflows/build-testing.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ jobs:
1414
runs-on: ubuntu-latest
1515
steps:
1616
- uses: actions/checkout@v2
17-
- name: Set up JDK 11
17+
- name: Set up JDK
1818
uses: actions/setup-java@v2
1919
with:
20-
java-version: '11'
20+
java-version: '17'
2121
distribution: 'temurin'
2222
cache: maven
2323
- name: Build testing for default platform

‎.github/workflows/pull_request-or-main.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -12,22 +12,22 @@ on:
1212
- main
1313

1414
env:
15-
DEFAULT_TARGET_PLATFORM: 'Eclipse-2022-09'
15+
DEFAULT_TARGET_PLATFORM: 'Eclipse-2022-12'
1616

1717
jobs:
1818

1919
platform:
2020
strategy:
2121
fail-fast: false
2222
matrix:
23-
target-platform: ['Eclipse-4.8', 'Eclipse-2022-03', 'Eclipse-2022-06', 'Eclipse-2022-09']
23+
target-platform: ['Eclipse-4.8', 'Eclipse-2022-09', 'Eclipse-2022-12', 'Eclipse-2023-03']
2424
runs-on: ubuntu-latest
2525
steps:
2626
- uses: actions/checkout@v2
27-
- name: Set up JDK 11
27+
- name: Set up JDK
2828
uses: actions/setup-java@v2
2929
with:
30-
java-version: '11'
30+
java-version: '17'
3131
distribution: 'temurin'
3232
cache: maven
3333
- name: 'Build for platform: ${{ matrix.target-platform }}'

‎.mvn/extensions.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,6 @@
33
<extension>
44
<groupId>org.eclipse.tycho</groupId>
55
<artifactId>tycho-build</artifactId>
6-
<version>2.7.0</version>
6+
<version>2.7.5</version>
77
</extension>
88
</extensions>

‎feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ supported!
1616
</description>
1717

1818
<copyright>
19-
Copyright (c) 2014-2022 Andre Bossert &lt;[email protected]&gt;.
19+
Copyright (c) 2014-2023 Andre Bossert &lt;[email protected]&gt;.
2020
See the NOTICE file(s) distributed with this work for additional
2121
information regarding copyright ownership.
2222
This program and the accompanying materials are made available

‎platform/Eclipse-2022-12.target

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="eclipse-2022-12(4.26)" sequenceNumber="6">
2+
<locations>
3+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
5+
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
6+
<repository location="http://download.eclipse.org/releases/2022-12"/>
7+
</location>
8+
</locations>
9+
</target>

‎platform/Eclipse-2023-03.target

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="eclipse-2023-03(4.27)" sequenceNumber="6">
2+
<locations>
3+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
5+
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
6+
<repository location="http://download.eclipse.org/releases/2023-03"/>
7+
</location>
8+
</locations>
9+
</target>

‎platform/Eclipse-2023-06.target

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?><?pde version="3.8"?><target name="eclipse-2023-06(4.28)" sequenceNumber="6">
2+
<locations>
3+
<location includeAllPlatforms="false" includeConfigurePhase="true" includeMode="planner" includeSource="true" type="InstallableUnit">
4+
<unit id="org.eclipse.sdk.ide" version="0.0.0"/>
5+
<unit id="org.eclipse.cdt.sdk.feature.group" version="0.0.0"/>
6+
<repository location="http://download.eclipse.org/releases/2023-06"/>
7+
</location>
8+
</locations>
9+
</target>

‎plugin/.classpath

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11">
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-17">
44
<attributes>
55
<attribute name="module" value="true"/>
66
</attributes>

‎plugin/.settings/org.eclipse.jdt.core.prefs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
33
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
4-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
4+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=17
55
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
6-
org.eclipse.jdt.core.compiler.compliance=11
6+
org.eclipse.jdt.core.compiler.compliance=17
77
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
88
org.eclipse.jdt.core.compiler.debug.localVariable=generate
99
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
@@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
1212
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
1313
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
1414
org.eclipse.jdt.core.compiler.release=enabled
15-
org.eclipse.jdt.core.compiler.source=11
15+
org.eclipse.jdt.core.compiler.source=17

‎plugin/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ Require-Bundle: org.eclipse.ui,
1717
org.eclipse.ui.workbench.texteditor,
1818
org.eclipse.jface.text,
1919
org.eclipse.debug.ui
20-
Bundle-RequiredExecutionEnvironment: JavaSE-11
20+
Bundle-RequiredExecutionEnvironment: JavaSE-17
2121
Bundle-ActivationPolicy: lazy
2222
Bundle-ClassPath: target/easyshell-library.jar
2323
Automatic-Module-Name: de.anbos.eclipse.easyshell.plugin

‎pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
<new.version>2.3.0-SNAPSHOT</new.version>
2222
<version.milestone>8</version.milestone>
2323
<tycho.version>2.7.5</tycho.version>
24-
<target.platform>Eclipse-2022-09</target.platform>
25-
<target.platform.url>http://download.eclipse.org/releases/2022-09</target.platform.url>
24+
<target.platform>Eclipse-2022-12</target.platform>
25+
<target.platform.url>http://download.eclipse.org/releases/2022-12</target.platform.url>
2626
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
2727
</properties>
2828

‎site/pom.xml

+6-1
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,14 @@
5757
<type>eclipse-feature</type>
5858
</dependency>
5959
<dependency>
60-
<artifactId>org.eclipse.equinox.ds</artifactId>
60+
<artifactId>org.apache.felix.scr</artifactId>
6161
<type>eclipse-plugin</type>
6262
</dependency>
63+
<dependency>
64+
<groupId>org.openjdk.nashorn</groupId>
65+
<artifactId>nashorn-core</artifactId>
66+
<version>15.1</version>
67+
</dependency>
6368
</dependencies>
6469
</configuration>
6570
<executions>

0 commit comments

Comments
 (0)