Skip to content

Add SVGs to org.eclipse.compare bundles #1812

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 22, 2025

Conversation

Michael5601
Copy link
Contributor

This PR adds SVGs for all icons in the bundles org.eclipse.compare, org.eclipse.compare.tests and org.eclipse.compare.win32.

See also this PR for more information.

@eclipse-platform-bot
Copy link
Contributor

This pull request changes some projects for the first time in this development cycle.
Therefore the following files need a version increment:

team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF
team/bundles/org.eclipse.compare.win32/pom.xml

An additional commit containing all the necessary changes was pushed to the top of this PR's branch. To obtain these changes (for example if you want to push more changes) either fetch from your fork or apply the git patch.

Git patch
From 07565b933878c98d176502a2969fffc1bf421e08 Mon Sep 17 00:00:00 2001
From: Eclipse Platform Bot <[email protected]>
Date: Mon, 14 Apr 2025 08:22:12 +0000
Subject: [PATCH] Version bump(s) for 4.36 stream


diff --git a/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF b/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF
index db4288e45a..f98167fde7 100644
--- a/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF
+++ b/team/bundles/org.eclipse.compare.win32/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.compare.win32;singleton:=true
-Bundle-Version: 1.3.400.qualifier
+Bundle-Version: 1.3.500.qualifier
 Bundle-Vendor: %providerName
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Eclipse-PlatformFilter: (osgi.os=win32)
diff --git a/team/bundles/org.eclipse.compare.win32/pom.xml b/team/bundles/org.eclipse.compare.win32/pom.xml
index 573d996559..f25c2d6cf3 100644
--- a/team/bundles/org.eclipse.compare.win32/pom.xml
+++ b/team/bundles/org.eclipse.compare.win32/pom.xml
@@ -18,7 +18,7 @@
     <relativePath>../../</relativePath>
   </parent>
   <artifactId>org.eclipse.compare.win32</artifactId>
-  <version>1.3.400-SNAPSHOT</version>
+  <version>1.3.500-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
   <properties>
-- 
2.49.0

Further information are available in Common Build Issues - Missing version increments.

Copy link
Contributor

github-actions bot commented Apr 14, 2025

Test Results

 1 758 files  ±0   1 758 suites  ±0   1h 28m 11s ⏱️ -44s
 4 173 tests ±0   4 150 ✅ ±0   23 💤 ±0  0 ❌ ±0 
13 119 runs  ±0  12 952 ✅ ±0  167 💤 ±0  0 ❌ ±0 

Results for commit 5cc704d. ± Comparison against base commit e16edfe.

♻️ This comment has been updated with latest results.

@Michael5601 Michael5601 force-pushed the Compare-SVGs branch 4 times, most recently from 7bf91b0 to 6450334 Compare April 15, 2025 09:00
Copy link
Contributor

@HeikoKlare HeikoKlare left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In general, the change looks good. I only found that the plugin.properties in the org.eclipse.compare bundle still contains references to PNG files (for which also SVG files exist). Is that intentional or by accident, @Michael5601?

@Michael5601
Copy link
Contributor Author

In general, the change looks good. I only found that the plugin.properties in the org.eclipse.compare bundle still contains references to PNG files (for which also SVG files exist). Is that intentional or by accident, @Michael5601?

Thanks for the review :) The leftover png references in the plugin.properties were an oversight. I fixed it.

Michael5601 and others added 2 commits April 20, 2025 10:03
This commit adds SVGs for all icons in the bundles `org.eclipse.compare`,  `org.eclipse.compare.tests` and `org.eclipse.compare.win32`.
@HeikoKlare
Copy link
Contributor

Merging this despite Jenkins failure caused by https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/5892

Since master builds seem to still work on Jenkins, the subsequent master build should hopefully work, thus I will check results of that build to retrospectively validate this PR.

@HeikoKlare HeikoKlare merged commit 9698efe into eclipse-platform:master Apr 22, 2025
11 of 13 checks passed
@Michael5601 Michael5601 deleted the Compare-SVGs branch April 22, 2025 09:32
@HeikoKlare
Copy link
Contributor

No new issues on subsequent master build for 9698efe

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants