Skip to content

Commit

Permalink
Merge pull request #1618 from Sloeber/make_release_4_4_3
Browse files Browse the repository at this point in the history
upgrade to 4.4.3
  • Loading branch information
jantje authored Feb 7, 2024
2 parents cb66d22 + 8caff30 commit e814cb2
Show file tree
Hide file tree
Showing 72 changed files with 493 additions and 377 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,43 +15,43 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Set up Maven
uses: stCarolas/[email protected]
with:
maven-version: 3.9.6
- name: Set up JDK 17
uses: actions/setup-java@v2
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'adopt'
- name: Build Sloeber with Maven
run: mvn --no-transfer-progress verify -Pall,sloeber_release,NOSDK -Dtest=NightlyJenkins -DfailIfNoTests=false

- name: Archive production artifacts
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: Repository
path: io.sloeber.updatesite/target/repository
- name: Archive Windows 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: windows
name: sloeber-ide-sloeber_release-win32.win32.x86_64.zip
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-win32.win32.x86_64.zip
- name: Archive Linux 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: linux
name: sloeber-ide-sloeber_release-linux.gtk.x86_64.tar.gz
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-linux.gtk.x86_64.tar.gz
- name: Archive Mac 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macosx
name: sloeber-ide-sloeber_release-macosx.cocoa.x86_64.zip
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-macosx.cocoa.x86_64.zip
- name: Archive Mac ARM 64 bit
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4
with:
name: macosx_arm
name: sloeber-ide-sloeber_release-macosx.cocoa.aarch64.zip
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-macosx.cocoa.aarch64.zip
- name: Build Sloeber SDK with Maven
run: mvn clean verify -PSDK,win64,latest -DskipTests=true
Expand Down
25 changes: 17 additions & 8 deletions images_plugin_dev_setup/SVG_Logo/splash.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion io.sloeber.core.nl1/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
Bundle-Name: Sloeber core language pack
Bundle-SymbolicName: io.sloeber.core.nl1;singleton:=true
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Version: 4.4.2.qualifier
Bundle-Version: 4.4.3.qualifier
Fragment-Host: io.sloeber.core
Bundle-Vendor: Sloeber.io
Automatic-Module-Name: io.sloeber.core.nl1
2 changes: 1 addition & 1 deletion io.sloeber.core.nl1/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
</parent>

Expand Down
6 changes: 4 additions & 2 deletions io.sloeber.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Arduino eclipse plugin
Bundle-SymbolicName: io.sloeber.core;singleton:=true
Bundle-Version: 4.4.2.qualifier
Bundle-Version: 4.4.3.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: Sloeber.io
Bundle-ActivationPolicy: lazy
Expand All @@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
org.eclipse.core.variables,
org.apache.commons.commons-io,
org.apache.commons.commons-compress,
com.github.luben.zstd-jni;bundle-version="1.5.5"
com.github.luben.zstd-jni;bundle-version="1.5.5",
slf4j.api;bundle-version="2.0.9",
org.eclipse.ui.intro
Export-Package: cc.arduino.packages;x-internal:=true,
cc.arduino.packages.discoverers;x-internal:=true,
cc.arduino.packages.ssh;x-internal:=true,
Expand Down
4 changes: 3 additions & 1 deletion io.sloeber.core/build.properties
Original file line number Diff line number Diff line change
Expand Up @@ -12,5 +12,7 @@ bin.includes = .,\
lib/jsch-0.1.55.jar,\
OSGI-INF/l10n/bundle.properties,\
lib/jssc-2.9.4.jar,\
lib/jmdns-3.5.7.jar
lib/jmdns-3.5.7.jar,\
icons/,\
launch/
jars.compile.order = .
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes.
File renamed without changes.
File renamed without changes.
72 changes: 71 additions & 1 deletion io.sloeber.core/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,77 @@ priority="high"/>
supportsArgument="true">
</variable>
</extension>


<extension
id="product"
name="Sloeber"
point="org.eclipse.core.runtime.products">
<product
application="org.eclipse.ui.ide.workbench"
description="Arduino layer for CDT"
name="Sloeber">
<property
name="windowImages"
value="icons/logo_16.png,icons/logo_32.png,icons/logo_48.png,icons/logo_64.png,icons/logo_128.png,icons/logo_256.png">
</property>
<property
name="startupForegroundColor"
value="C8D5EA">
</property>
<property
name="startupProgressRect"
value="97,370,100,4">
</property>
<property
name="startupMessageRect"
value="400,370,441,20">
</property>
<property
name="appName"
value="Sloeber">
</property>
<property
name="aboutImage"
value="icons/eclipse_lg.png">
</property>
<property
name="preferenceCustomization"
value="plugin_customization.ini">
</property>
<property
name="aboutText"
value="Sloeber, the Eclipse IDE for Arduino Developers&#x0A;&#x0A;Info: https://eclipse.baeyens.it/&#x0A;Source: https://github.com/sloeber/arduino-eclipse-plugin&#x0A;&#x0A;&#x0A;Contributors (github users): jantje, wimjongman, rlogiacco, MarceloLimori, brodykenrick, neuweiler, darcade, amorellgarcia&#x0A;&#x0A;https://github.com/sloeber/arduino-eclipse-plugin/graphs/contributors">
</property>
</product>
</extension>
<extension
id="io.sloeber.product.intro"
point="org.eclipse.ui.intro">
<intro
class="org.eclipse.ui.intro.config.CustomizableIntroPart"
id="io.sloeber.product.intro">
</intro>
<introProductBinding
introId="io.sloeber.product.intro"
productId="io.sloeber.product.sloeber">
</introProductBinding>
</extension>
<extension
point="org.eclipse.ui.intro.config">
<config
content="introContent.xml"
id="io.sloeber.product.introConfigId"
introId="io.sloeber.product.intro">
<presentation
home-page-id="root">
<implementation
kind="html"
os="win32,linux,macosx"
style="content/shared.css">
</implementation>
</presentation>
</config>
</extension>
</plugin>


Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.feature/feature.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<feature
id="io.sloeber.feature"
label="%featureName"
version="4.4.2.qualifier"
version="4.4.3.qualifier"
provider-name="%provider">

<description url="http://eclipse.baeyens.it">
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<parent>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<relativePath>../io.sloeber.parent</relativePath>
</parent>

Expand Down
8 changes: 1 addition & 7 deletions io.sloeber.parent/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
<artifactId>io.sloeber.parent</artifactId>
<version>4.4.2-SNAPSHOT</version>
<version>4.4.3-SNAPSHOT</version>
<packaging>pom</packaging>

<properties>
Expand Down Expand Up @@ -123,13 +123,7 @@
<profile>
<id>SDK</id>
<modules>
<module>../io.sloeber.feature</module>
<module>../io.sloeber.core</module>
<module>../io.sloeber.core.nl1</module>
<module>../io.sloeber.product.sdk</module>
<module>../io.sloeber.ui.nl1</module>
<module>../io.sloeber.ui</module>
<module>../io.sloeber.tests</module>
</modules>
</profile>

Expand Down
1 change: 0 additions & 1 deletion io.sloeber.product.sdk/.classpath
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" path="src"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="output" path="bin"/>
Expand Down
2 changes: 1 addition & 1 deletion io.sloeber.product.sdk/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: Sloeber SDK
Bundle-SymbolicName: io.sloeber.product.sdk;singleton:=true
Bundle-Version: 4.4.2.qualifier
Bundle-Version: 4.4.3.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Bundle-Vendor: baeyens.it
Automatic-Module-Name: io.sloeber.product.sdk
18 changes: 15 additions & 3 deletions io.sloeber.product.sdk/build.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
output.. = bin/
bin.includes = META-INF/,\
.,\
plugin_customization.ini
plugin.xml,\
splash.bmp,\
sdk.product,\
bin/,\
icons/,\
introSDKContent.xml,\
plugin_customization.ini,\
launch/,\
.classpath,\
.gitignore,\
.project,\
.settings/,\
build.properties,\
p2.inf,\
pom.xml

source.. = src/
8 changes: 8 additions & 0 deletions io.sloeber.product.sdk/introSDKContent.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<introContent>
<!-- Root page -->
<page id="root" style="html/style.css" style-id="page" >
<html text="hhh" id="my web site" src="https://eclipse.baeyens.it/product/V4_0_SDK.php" type="inline" />
</page>

</introContent>
Loading

0 comments on commit e814cb2

Please sign in to comment.