Skip to content
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

Fix build #396

Merged
merged 4 commits into from
May 12, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.core.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.tm4e.core.tests;singleton:=true
Bundle-Version: 0.4.2.qualifier
Require-Bundle: org.apache.batik.css;bundle-version="1.7.0";resolution:=optional,
org.apache.batik.util;bundle-version="1.7.0";resolution:=optional,
com.google.gson;resolution:=optional,
com.google.gson;bundle-version="2.9.0";resolution:=optional,
org.eclipse.core.runtime,
org.eclipse.tm4e.core
Import-Package: org.junit.runner,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.core/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-SymbolicName: org.eclipse.tm4e.core
Bundle-Version: 0.4.6.qualifier
Require-Bundle: org.apache.batik.css;bundle-version="1.9.1";resolution:=optional,
org.apache.batik.util;bundle-version="1.9.1";resolution:=optional,
com.google.gson,
com.google.gson;bundle-version="2.9.0",
com.google.guava;bundle-version="30.1.0",
org.jcodings;bundle-version="1.0.57",
org.joni;bundle-version="2.1.43",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ private final class PListObject {
this.values = values;
}

@SuppressWarnings("unchecked")
@SuppressWarnings({ "rawtypes", "unchecked" })
void addValue(final Object value) {
if (values instanceof PropertySettable propertySettable) {
propertySettable.setProperty(path.last(), value);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public PListParserYAML(final PropertySettable.Factory<PListPath> objectFactory)
this.objectFactory = objectFactory;
}

@SuppressWarnings("unchecked")
@SuppressWarnings({ "rawtypes", "unchecked" })
private void addListToPList(final PListContentHandler<T> pList, final List<Object> list) throws SAXException {
pList.startElement(null, "array", null, null);

Expand All @@ -51,7 +51,7 @@ private void addListToPList(final PListContentHandler<T> pList, final List<Objec
pList.endElement(null, "array", null);
}

@SuppressWarnings("unchecked")
@SuppressWarnings({ "rawtypes", "unchecked" })
private void addMapToPList(final PListContentHandler<T> pList, final Map<String, Object> map)
throws SAXException {
pList.startElement(null, "dict", null, null);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Bundle-Version: 0.4.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.jface.text,
org.eclipse.ui.genericeditor,
com.google.gson,
com.google.gson;bundle-version="2.9.0",
org.eclipse.tm4e.core;bundle-version="0.4.4",
org.eclipse.tm4e.ui;bundle-version="0.5.1",
org.eclipse.core.runtime,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.markdown/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.tm4e.markdown;singleton:=true
Bundle-Version: 0.3.6.qualifier
Bundle-Version: 0.3.7.qualifier
Require-Bundle: org.eclipse.core.runtime,
org.eclipse.tm4e.core;bundle-version="0.4.4",
org.eclipse.tm4e.registry;bundle-version="0.5.1",
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.markdown/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.tm4e.markdown</artifactId>
<packaging>eclipse-plugin</packaging>
<version>0.3.6-SNAPSHOT</version>
<version>0.3.7-SNAPSHOT</version>
<parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.tm4e</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.registry/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ Bundle-Version: 0.5.2.qualifier
Bundle-RequiredExecutionEnvironment: JavaSE-17
Require-Bundle: org.eclipse.tm4e.core;bundle-version="0.4.4",
org.eclipse.core.runtime,
com.google.gson,
com.google.gson;bundle-version="2.9.0",
org.eclipse.equinox.preferences
Export-Package: org.eclipse.tm4e.registry
Bundle-Activator: org.eclipse.tm4e.registry.TMEclipseRegistryPlugin
Expand Down
17 changes: 16 additions & 1 deletion org.eclipse.tm4e.repository/category.xml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,27 @@
<bundle id="org.eclipse.tm4e.samples.source" version="0.0.0">
<category name="Sources"/>
</bundle>
<bundle id="org.joni" version="0.0.0">
<bundle id="com.google.gson" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.apache.batik.constants" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.apache.batik.css" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.apache.batik.util" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.jcodings" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.joni" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<bundle id="org.yaml.snakeyaml" version="0.0.0">
<category name="Dependencies"/>
</bundle>
<category-def name="TextMate" label="TextMate"/>
<category-def name="Samples" label="Samples"/>
<category-def name="Sources" label="Sources"/>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.samples/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-SymbolicName: org.eclipse.tm4e.samples;singleton:=true
Bundle-Version: 0.3.7.qualifier
Bundle-Version: 0.3.8.qualifier
Require-Bundle: org.eclipse.jface.text,
org.eclipse.core.runtime,
org.eclipse.ui,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.samples/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<modelVersion>4.0.0</modelVersion>
<artifactId>org.eclipse.tm4e.samples</artifactId>
<packaging>eclipse-plugin</packaging>
<version>0.3.7-SNAPSHOT</version>
<version>0.3.8-SNAPSHOT</version>
<parent>
<groupId>org.eclipse</groupId>
<artifactId>org.eclipse.tm4e</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.ui.tests/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ Require-Bundle: org.eclipse.tm4e.core,
org.eclipse.ui,
org.eclipse.core.resources,
org.eclipse.core.filesystem,
com.google.gson,
com.google.gson;bundle-version="2.9.0",
org.eclipse.tm4e.ui,
org.junit,
org.junit.jupiter.api,
Expand Down
2 changes: 1 addition & 1 deletion org.eclipse.tm4e.ui/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Require-Bundle: org.eclipse.tm4e.core;bundle-version="0.4.4",
org.eclipse.core.filesystem,
org.eclipse.tm4e.registry,
org.eclipse.ui.ide;resolution:=optional,
com.google.gson,
com.google.gson;bundle-version="2.9.0",
com.google.guava,
org.eclipse.e4.ui.css.swt.theme,
org.eclipse.core.expressions,
Expand Down
16 changes: 10 additions & 6 deletions target-platform/tm4e-target.target
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,19 @@
<unit id="org.eclipse.jdt.junit5.runtime" version="0.0.0"/>
<unit id="org.eclipse.ui.trace" version="0.0.0"/>
<repository location="https://download.eclipse.org/eclipse/updates/4.23/"/>
</location>
<location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
<type>jar</type>
</dependency>
</dependencies>
</location>
<location includeDependencyDepth="direct" includeDependencyScopes="compile" includeSource="true" missingManifest="generate" type="Maven">
<dependencies>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.9.0</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.jruby.joni</groupId>
<artifactId>joni</artifactId>
Expand Down