Skip to content

Commit e814cb2

Browse files
authored
Merge pull request #1618 from Sloeber/make_release_4_4_3
upgrade to 4.4.3
2 parents cb66d22 + 8caff30 commit e814cb2

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+493
-377
lines changed

.github/workflows/maven.yml

+11-11
Original file line numberDiff line numberDiff line change
@@ -15,43 +15,43 @@ jobs:
1515
runs-on: ubuntu-latest
1616

1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v4
1919
- name: Set up Maven
2020
uses: stCarolas/[email protected]
2121
with:
2222
maven-version: 3.9.6
2323
- name: Set up JDK 17
24-
uses: actions/setup-java@v2
24+
uses: actions/setup-java@v4
2525
with:
2626
java-version: '17'
2727
distribution: 'adopt'
2828
- name: Build Sloeber with Maven
2929
run: mvn --no-transfer-progress verify -Pall,sloeber_release,NOSDK -Dtest=NightlyJenkins -DfailIfNoTests=false
3030

3131
- name: Archive production artifacts
32-
uses: actions/upload-artifact@v3
32+
uses: actions/upload-artifact@v4
3333
with:
3434
name: Repository
3535
path: io.sloeber.updatesite/target/repository
3636
- name: Archive Windows 64 bit
37-
uses: actions/upload-artifact@v3
37+
uses: actions/upload-artifact@v4
3838
with:
39-
name: windows
39+
name: sloeber-ide-sloeber_release-win32.win32.x86_64.zip
4040
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-win32.win32.x86_64.zip
4141
- name: Archive Linux 64 bit
42-
uses: actions/upload-artifact@v3
42+
uses: actions/upload-artifact@v4
4343
with:
44-
name: linux
44+
name: sloeber-ide-sloeber_release-linux.gtk.x86_64.tar.gz
4545
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-linux.gtk.x86_64.tar.gz
4646
- name: Archive Mac 64 bit
47-
uses: actions/upload-artifact@v3
47+
uses: actions/upload-artifact@v4
4848
with:
49-
name: macosx
49+
name: sloeber-ide-sloeber_release-macosx.cocoa.x86_64.zip
5050
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-macosx.cocoa.x86_64.zip
5151
- name: Archive Mac ARM 64 bit
52-
uses: actions/upload-artifact@v3
52+
uses: actions/upload-artifact@v4
5353
with:
54-
name: macosx_arm
54+
name: sloeber-ide-sloeber_release-macosx.cocoa.aarch64.zip
5555
path: io.sloeber.product/target/products/sloeber-ide-sloeber_release-macosx.cocoa.aarch64.zip
5656
- name: Build Sloeber SDK with Maven
5757
run: mvn clean verify -PSDK,win64,latest -DskipTests=true

images_plugin_dev_setup/SVG_Logo/splash.svg

+17-8
Loading

io.sloeber.core.nl1/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Bundle-ManifestVersion: 2
33
Bundle-Name: Sloeber core language pack
44
Bundle-SymbolicName: io.sloeber.core.nl1;singleton:=true
55
Bundle-RequiredExecutionEnvironment: JavaSE-17
6-
Bundle-Version: 4.4.2.qualifier
6+
Bundle-Version: 4.4.3.qualifier
77
Fragment-Host: io.sloeber.core
88
Bundle-Vendor: Sloeber.io
99
Automatic-Module-Name: io.sloeber.core.nl1

io.sloeber.core.nl1/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
66
<artifactId>io.sloeber.parent</artifactId>
7-
<version>4.4.2-SNAPSHOT</version>
7+
<version>4.4.3-SNAPSHOT</version>
88
<relativePath>../io.sloeber.parent</relativePath>
99
</parent>
1010

io.sloeber.core/META-INF/MANIFEST.MF

+4-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Arduino eclipse plugin
44
Bundle-SymbolicName: io.sloeber.core;singleton:=true
5-
Bundle-Version: 4.4.2.qualifier
5+
Bundle-Version: 4.4.3.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-17
77
Bundle-Vendor: Sloeber.io
88
Bundle-ActivationPolicy: lazy
@@ -23,7 +23,9 @@ Require-Bundle: org.eclipse.cdt.managedbuilder.core,
2323
org.eclipse.core.variables,
2424
org.apache.commons.commons-io,
2525
org.apache.commons.commons-compress,
26-
com.github.luben.zstd-jni;bundle-version="1.5.5"
26+
com.github.luben.zstd-jni;bundle-version="1.5.5",
27+
slf4j.api;bundle-version="2.0.9",
28+
org.eclipse.ui.intro
2729
Export-Package: cc.arduino.packages;x-internal:=true,
2830
cc.arduino.packages.discoverers;x-internal:=true,
2931
cc.arduino.packages.ssh;x-internal:=true,

io.sloeber.core/build.properties

+3-1
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,7 @@ bin.includes = .,\
1212
lib/jsch-0.1.55.jar,\
1313
OSGI-INF/l10n/bundle.properties,\
1414
lib/jssc-2.9.4.jar,\
15-
lib/jmdns-3.5.7.jar
15+
lib/jmdns-3.5.7.jar,\
16+
icons/,\
17+
launch/
1618
jars.compile.order = .
File renamed without changes.

io.sloeber.core/plugin.xml

+71-1
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,77 @@ priority="high"/>
529529
supportsArgument="true">
530530
</variable>
531531
</extension>
532-
532+
533+
<extension
534+
id="product"
535+
name="Sloeber"
536+
point="org.eclipse.core.runtime.products">
537+
<product
538+
application="org.eclipse.ui.ide.workbench"
539+
description="Arduino layer for CDT"
540+
name="Sloeber">
541+
<property
542+
name="windowImages"
543+
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">
544+
</property>
545+
<property
546+
name="startupForegroundColor"
547+
value="C8D5EA">
548+
</property>
549+
<property
550+
name="startupProgressRect"
551+
value="97,370,100,4">
552+
</property>
553+
<property
554+
name="startupMessageRect"
555+
value="400,370,441,20">
556+
</property>
557+
<property
558+
name="appName"
559+
value="Sloeber">
560+
</property>
561+
<property
562+
name="aboutImage"
563+
value="icons/eclipse_lg.png">
564+
</property>
565+
<property
566+
name="preferenceCustomization"
567+
value="plugin_customization.ini">
568+
</property>
569+
<property
570+
name="aboutText"
571+
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">
572+
</property>
573+
</product>
574+
</extension>
575+
<extension
576+
id="io.sloeber.product.intro"
577+
point="org.eclipse.ui.intro">
578+
<intro
579+
class="org.eclipse.ui.intro.config.CustomizableIntroPart"
580+
id="io.sloeber.product.intro">
581+
</intro>
582+
<introProductBinding
583+
introId="io.sloeber.product.intro"
584+
productId="io.sloeber.product.sloeber">
585+
</introProductBinding>
586+
</extension>
587+
<extension
588+
point="org.eclipse.ui.intro.config">
589+
<config
590+
content="introContent.xml"
591+
id="io.sloeber.product.introConfigId"
592+
introId="io.sloeber.product.intro">
593+
<presentation
594+
home-page-id="root">
595+
<implementation
596+
kind="html"
597+
os="win32,linux,macosx"
598+
style="content/shared.css">
599+
</implementation>
600+
</presentation>
601+
</config>
602+
</extension>
533603
</plugin>
534604

535605

io.sloeber.core/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
66
<artifactId>io.sloeber.parent</artifactId>
7-
<version>4.4.2-SNAPSHOT</version>
7+
<version>4.4.3-SNAPSHOT</version>
88
<relativePath>../io.sloeber.parent</relativePath>
99
</parent>
1010

io.sloeber.feature/feature.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<feature
33
id="io.sloeber.feature"
44
label="%featureName"
5-
version="4.4.2.qualifier"
5+
version="4.4.3.qualifier"
66
provider-name="%provider">
77

88
<description url="http://eclipse.baeyens.it">

io.sloeber.feature/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<parent>
55
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
66
<artifactId>io.sloeber.parent</artifactId>
7-
<version>4.4.2-SNAPSHOT</version>
7+
<version>4.4.3-SNAPSHOT</version>
88
<relativePath>../io.sloeber.parent</relativePath>
99
</parent>
1010

io.sloeber.parent/pom.xml

+1-7
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<modelVersion>4.0.0</modelVersion>
66
<groupId>io.sloeber.arduino-eclipse-plugin</groupId>
77
<artifactId>io.sloeber.parent</artifactId>
8-
<version>4.4.2-SNAPSHOT</version>
8+
<version>4.4.3-SNAPSHOT</version>
99
<packaging>pom</packaging>
1010

1111
<properties>
@@ -123,13 +123,7 @@
123123
<profile>
124124
<id>SDK</id>
125125
<modules>
126-
<module>../io.sloeber.feature</module>
127-
<module>../io.sloeber.core</module>
128-
<module>../io.sloeber.core.nl1</module>
129126
<module>../io.sloeber.product.sdk</module>
130-
<module>../io.sloeber.ui.nl1</module>
131-
<module>../io.sloeber.ui</module>
132-
<module>../io.sloeber.tests</module>
133127
</modules>
134128
</profile>
135129

io.sloeber.product.sdk/.classpath

-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="src" path="src"/>
43
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
54
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
65
<classpathentry kind="output" path="bin"/>

io.sloeber.product.sdk/META-INF/MANIFEST.MF

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
22
Bundle-ManifestVersion: 2
33
Bundle-Name: Sloeber SDK
44
Bundle-SymbolicName: io.sloeber.product.sdk;singleton:=true
5-
Bundle-Version: 4.4.2.qualifier
5+
Bundle-Version: 4.4.3.qualifier
66
Bundle-RequiredExecutionEnvironment: JavaSE-17
77
Bundle-Vendor: baeyens.it
88
Automatic-Module-Name: io.sloeber.product.sdk

io.sloeber.product.sdk/build.properties

+15-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,18 @@
1-
output.. = bin/
21
bin.includes = META-INF/,\
32
.,\
4-
plugin_customization.ini
3+
plugin.xml,\
4+
splash.bmp,\
5+
sdk.product,\
6+
bin/,\
7+
icons/,\
8+
introSDKContent.xml,\
9+
plugin_customization.ini,\
10+
launch/,\
11+
.classpath,\
12+
.gitignore,\
13+
.project,\
14+
.settings/,\
15+
build.properties,\
16+
p2.inf,\
17+
pom.xml
518

6-
source.. = src/
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8" ?>
2+
<introContent>
3+
<!-- Root page -->
4+
<page id="root" style="html/style.css" style-id="page" >
5+
<html text="hhh" id="my web site" src="https://eclipse.baeyens.it/product/V4_0_SDK.php" type="inline" />
6+
</page>
7+
8+
</introContent>

0 commit comments

Comments
 (0)