Skip to content

Commit a23136c

Browse files
angelozerrangelozerr
committed
1 parent 661b0f9 commit a23136c

File tree

15 files changed

+66
-25
lines changed

15 files changed

+66
-25
lines changed

‎pom.xml

Lines changed: 45 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,43 @@
7272
</environments>
7373
</configuration>
7474
</plugin>
75+
<plugin>
76+
<groupId>org.apache.maven.plugins</groupId>
77+
<artifactId>maven-surefire-plugin</artifactId>
78+
<version>2.12.4</version>
79+
<executions>
80+
<execution>
81+
<id>test</id>
82+
<phase>test</phase>
83+
<configuration>
84+
<includes>
85+
<include>**/*Tests.java</include>
86+
</includes>
87+
</configuration>
88+
<goals>
89+
<goal>test</goal>
90+
</goals>
91+
</execution>
92+
</executions>
93+
</plugin>
94+
<plugin>
95+
<groupId>org.apache.maven.plugins</groupId>
96+
<artifactId>maven-compiler-plugin</artifactId>
97+
<version>2.5.1</version>
98+
<configuration>
99+
<source>1.8</source>
100+
<target>1.8</target>
101+
</configuration>
102+
<executions>
103+
<execution>
104+
<id>compiletests</id>
105+
<phase>test-compile</phase>
106+
<goals>
107+
<goal>testCompile</goal>
108+
</goals>
109+
</execution>
110+
</executions>
111+
</plugin>
75112
<plugin>
76113
<groupId>org.eclipse.tycho.extras</groupId>
77114
<artifactId>tycho-source-feature-plugin</artifactId>
@@ -113,6 +150,11 @@
113150
</execution>
114151
</executions>
115152
</plugin>
153+
<plugin>
154+
<groupId>org.eclipse.tycho</groupId>
155+
<artifactId>tycho-packaging-plugin</artifactId>
156+
<version>${tycho-version}</version>
157+
</plugin>
116158
<plugin>
117159
<groupId>com.mycila.maven-license-plugin</groupId>
118160
<artifactId>maven-license-plugin</artifactId>
@@ -129,15 +171,16 @@
129171
<artifactId>maven-release-plugin</artifactId>
130172
<configuration>
131173
<autoVersionSubmodules>true</autoVersionSubmodules>
174+
<releaseProfiles>lax</releaseProfiles>
132175
</configuration>
133176
</plugin>
134177
<plugin>
135178
<groupId>org.eclipse.tycho</groupId>
136179
<artifactId>tycho-compiler-plugin</artifactId>
137180
<version>${tycho-version}</version>
138181
<configuration>
139-
<source>1.7</source>
140-
<target>1.7</target>
182+
<source>1.8</source>
183+
<target>1.8</target>
141184
</configuration>
142185
</plugin>
143186
<plugin>

‎ts.eclipse.ide.angular2.cli/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.7"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src/"/>
66
<classpathentry kind="output" path="target/classes"/>

‎ts.eclipse.ide.angular2.cli/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
4-
org.eclipse.jdt.core.compiler.compliance=1.7
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.7
7+
org.eclipse.jdt.core.compiler.source=1.8

‎ts.eclipse.ide.angular2.cli/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: ts.eclipse.ide.angular2.cli;singleton:=true
77
Bundle-Version: 1.2.0.qualifier
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.7
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Require-Bundle: org.eclipse.core.runtime,
1010
org.eclipse.core.resources,
1111
org.eclipse.ui.ide,

‎ts.eclipse.ide.angular2.core.tests/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src/"/>
66
<classpathentry kind="output" path="target/classes"/>

‎ts.eclipse.ide.angular2.core.tests/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
7+
org.eclipse.jdt.core.compiler.source=1.8

‎ts.eclipse.ide.angular2.core.tests/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: ts.eclipse.ide.angular2.core.tests;singleton:=true
77
Bundle-Version: 1.2.0.qualifier
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Require-Bundle: org.junit;bundle-version="4.11.0",
1010
org.eclipse.wst.xml.core;bundle-version="1.1.1000",
1111
org.eclipse.wst.sse.core;bundle-version="1.1.1000",

‎ts.eclipse.ide.angular2.core/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src/"/>
66
<classpathentry kind="output" path="target/classes"/>

‎ts.eclipse.ide.angular2.core/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
7+
org.eclipse.jdt.core.compiler.source=1.8

‎ts.eclipse.ide.angular2.core/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: ts.eclipse.ide.angular2.core;singleton:=true
77
Bundle-Version: 1.2.0.qualifier
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Require-Bundle: org.eclipse.core.runtime,
1010
org.eclipse.core.resources,
1111
ts.repository,

‎ts.eclipse.ide.angular2.core/src/ts/eclipse/ide/angular2/core/html/INgBindingType.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
import org.eclipse.wst.sse.core.internal.validate.ValidationMessage;
55
import org.eclipse.wst.xml.core.internal.provisional.document.IDOMElement;
66

7-
import ts.client.completions.ICompletionEntry;
8-
97
public interface INgBindingType {
108

119
String formatAttr(String name);

‎ts.eclipse.ide.angular2.ui/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<classpath>
3-
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
3+
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
44
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
55
<classpathentry kind="src" path="src/"/>
66
<classpathentry kind="output" path="target/classes"/>

‎ts.eclipse.ide.angular2.ui/.settings/org.eclipse.jdt.core.prefs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
eclipse.preferences.version=1
22
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
3-
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
4-
org.eclipse.jdt.core.compiler.compliance=1.6
3+
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
4+
org.eclipse.jdt.core.compiler.compliance=1.8
55
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
66
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
7-
org.eclipse.jdt.core.compiler.source=1.6
7+
org.eclipse.jdt.core.compiler.source=1.8

‎ts.eclipse.ide.angular2.ui/META-INF/MANIFEST.MF

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ Bundle-Vendor: %providerName
55
Bundle-Localization: plugin
66
Bundle-SymbolicName: ts.eclipse.ide.angular2.ui;singleton:=true
77
Bundle-Version: 1.2.0.qualifier
8-
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
8+
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
99
Require-Bundle: org.eclipse.ui,
1010
org.eclipse.core.runtime,
1111
org.eclipse.core.resources,

‎ts.eclipse.ide.angular2.ui/src/ts/eclipse/ide/angular2/internal/ui/contentassist/TypeScriptAngular2TemplateCompletionProposalComputer.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public TypeScriptAngular2TemplateCompletionProposalComputer() {
2828
protected TemplateEngine computeCompletionEngine(TypeScriptContentAssistInvocationContext context) {
2929
try {
3030
IResource resource = context.getResource();
31-
if (!Angular2Project.isAngular2Project(resource.getProject())) {
31+
if (resource == null || !Angular2Project.isAngular2Project(resource.getProject())) {
3232
return null;
3333
}
3434
String partition = TextUtilities.getContentType(context.getDocument(),

0 commit comments

Comments
 (0)