From 1a7a5870bc2af49f1fb854248efa04f477713865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=8A?= =?UTF-8?q?=D1=80=20=D0=9A=D1=83=D1=80=D1=82=D0=B0=D0=BA=D0=BE=D0=B2?= Date: Sat, 11 Dec 2021 14:23:30 +0200 Subject: [PATCH] Update to latest dependencies and build tools (#18) --- .github/workflows/maven.yml | 32 +++++++++++++++++++ .mvn/extensions.xml | 2 +- eclipse-solargraph-plugin/.classpath | 4 +-- .../.settings/org.eclipse.jdt.core.prefs | 9 ++++-- .../META-INF/MANIFEST.MF | 2 +- .../eclipse-solargraph-target-platform.target | 2 +- pom.xml | 2 +- 7 files changed, 44 insertions(+), 9 deletions(-) create mode 100644 .github/workflows/maven.yml diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml new file mode 100644 index 0000000..e8a8dcb --- /dev/null +++ b/.github/workflows/maven.yml @@ -0,0 +1,32 @@ +# This workflow will build a Java project with Maven +# For more information see: https://help.github.com/actions/language-and-framework-guides/building-and-testing-java-with-maven + +name: Build Tycho + +on: + push: + branches: [ master ] + pull_request: + branches: [ master ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Set up JDK 17 + uses: actions/setup-java@v2 + with: + java-version: '17' + distribution: 'adopt' + - name: Cache local Maven repository + uses: actions/cache@v2 + with: + path: ~/.m2/repository + key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }} + restore-keys: | + ${{ runner.os }}-maven- + - name: Build with Maven + run: mvn -U -V -e clean install diff --git a/.mvn/extensions.xml b/.mvn/extensions.xml index 10751ac..382fba9 100644 --- a/.mvn/extensions.xml +++ b/.mvn/extensions.xml @@ -3,6 +3,6 @@ org.eclipse.tycho.extras tycho-pomless - 2.0.0 + 2.5.0 \ No newline at end of file diff --git a/eclipse-solargraph-plugin/.classpath b/eclipse-solargraph-plugin/.classpath index 3e28a04..b931e34 100644 --- a/eclipse-solargraph-plugin/.classpath +++ b/eclipse-solargraph-plugin/.classpath @@ -1,7 +1,7 @@ - + - + diff --git a/eclipse-solargraph-plugin/.settings/org.eclipse.jdt.core.prefs b/eclipse-solargraph-plugin/.settings/org.eclipse.jdt.core.prefs index a698e59..a58ebdc 100644 --- a/eclipse-solargraph-plugin/.settings/org.eclipse.jdt.core.prefs +++ b/eclipse-solargraph-plugin/.settings/org.eclipse.jdt.core.prefs @@ -1,12 +1,15 @@ eclipse.preferences.version=1 org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8 +org.eclipse.jdt.core.compiler.codegen.targetPlatform=11 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.8 +org.eclipse.jdt.core.compiler.compliance=11 org.eclipse.jdt.core.compiler.debug.lineNumber=generate org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.debug.sourceFile=generate org.eclipse.jdt.core.compiler.problem.assertIdentifier=error +org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.source=1.8 +org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning +org.eclipse.jdt.core.compiler.release=enabled +org.eclipse.jdt.core.compiler.source=11 diff --git a/eclipse-solargraph-plugin/META-INF/MANIFEST.MF b/eclipse-solargraph-plugin/META-INF/MANIFEST.MF index 997b924..935f3c7 100644 --- a/eclipse-solargraph-plugin/META-INF/MANIFEST.MF +++ b/eclipse-solargraph-plugin/META-INF/MANIFEST.MF @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.core.runtime, org.eclipse.tm4e.ui, org.eclipse.ui, org.eclipse.ui.genericeditor -Bundle-RequiredExecutionEnvironment: JavaSE-1.8 +Bundle-RequiredExecutionEnvironment: JavaSE-11 Bundle-ActivationPolicy: lazy Automatic-Module-Name: io.github.pyvesb.eclipse_solargraph Bundle-ClassPath: . diff --git a/eclipse-solargraph-target-platform/eclipse-solargraph-target-platform.target b/eclipse-solargraph-target-platform/eclipse-solargraph-target-platform.target index f5351d2..c549db6 100644 --- a/eclipse-solargraph-target-platform/eclipse-solargraph-target-platform.target +++ b/eclipse-solargraph-target-platform/eclipse-solargraph-target-platform.target @@ -3,7 +3,7 @@ - + diff --git a/pom.xml b/pom.xml index b39925b..2db6af9 100644 --- a/pom.xml +++ b/pom.xml @@ -16,7 +16,7 @@ UTF-8 - 2.4.0 + 2.5.0