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

Upgrade to TypeScript 2.6.1 #353

Open
wants to merge 16 commits into
base: master
Choose a base branch
from
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,6 @@ target/

/com.palantir.typescript/bin/
/com.palantir.typescript/bridge/build/

TypeScript/*
updatesite
20 changes: 13 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ An Eclipse plug-in for developing in the TypeScript language.
1. Install [Node.js](http://nodejs.org/)
1. Open Eclipse and go to Help->Install New Software
1. Add the update site: http://eclipse-update.palantir.com/eclipse-typescript/
1. Reboot Eclipse
1. Restart Eclipse
1. (optional) Right-click on a project and select Configure->Enable TypeScript Builder

## Features
Expand All @@ -28,18 +28,24 @@ An Eclipse plug-in for developing in the TypeScript language.
* toggle comments

## Additional Information
* Eclipse Kepler (4.3) and Luna (4.4) are supported
* Eclipse must be running via Java 6+
* Eclipse Luna (4.4) Neon (4.5) Oxygen (4.6)
* Eclipse must be running via Java 8+
* [Wiki](https://github.com/palantir/eclipse-typescript/wiki) (contains information about developing the plug-in)

## Development
### Update Typescript
* For 100% working result, If your not in Linux use Cygwin shell (download dos2unix).
* Clone Typescript into a sibling folder
* Manually checkout latest branch. This is simpler and 100% sure.
* Run `npm install` in the Typescript project
* Run `npm install -g dos2unix jake`
* Update Typescript branch in `./scripts/updateTypeScript.sh`
* Run `./scripts/updateTypeScript.sh`
* In script directory Run `./updateTypeScript.sh`

### Build and Test
* Run `maven package`
### now build Eclipse plugin and Test
* Update package.json for new version.
* Run `mvn versions:set -DnewVersion=x.x.x -DgenerateBackupPoms=false -U`
* Run `update_version.sh old_version new_version` This is to change all version ".qualifier"
* Run `npm install`
* Run `grunt`
* Run `mvn package`
* Install zip in Eclipse following `Install New Software...` -> `Add...` -> `Archive...`
6 changes: 6 additions & 0 deletions com.palantir.typescript.feature/.project
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,14 @@
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>org.eclipse.pde.FeatureNature</nature>
</natures>
</projectDescription>
54 changes: 27 additions & 27 deletions com.palantir.typescript.feature/feature.xml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2013 Palantir Technologies, Inc.

Expand All @@ -13,22 +13,22 @@
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<feature
id="com.palantir.typescript.feature"
label="TypeScript"
version="2.1.0.qualifier"
provider-name="Palantir Technologies, Inc.">

<description url="https://github.com/palantir/eclipse-typescript">
An Eclipse plug-in for developing in the TypeScript language.
</description>

<copyright url="http://www.palantir.com">
Copyright 2013 Palantir Technologies, Inc.
</copyright>

<license url="https://github.com/palantir/eclipse-typescript/blob/master/LICENSE.txt">
-->
<feature
id="com.palantir.typescript.feature"
label="TypeScript"
version="2.6.1.qualifier"
provider-name="Palantir Technologies, Inc.">
<description url="https://github.com/palantir/eclipse-typescript">
An Eclipse plug-in for developing in the TypeScript language.
</description>
<copyright url="http://www.palantir.com">
Copyright 2013 Palantir Technologies, Inc.
</copyright>
<license url="https://github.com/palantir/eclipse-typescript/blob/master/LICENSE.txt">
.
Apache License
Version 2.0, January 2004
Expand Down Expand Up @@ -230,13 +230,13 @@
distributed under the License is distributed on an &quot;AS IS&quot; BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
</license>

<plugin
id="com.palantir.typescript"
download-size="0"
install-size="0"
version="2.1.0.qualifier"/>

</feature>
limitations under the License.
</license>
<plugin
id="com.palantir.typescript"
download-size="0"
install-size="0"
version="2.6.1.qualifier"/>
</feature>
2 changes: 1 addition & 1 deletion com.palantir.typescript.feature/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.palantir</groupId>
<artifactId>parent</artifactId>
<version>2.1.0.qualifier</version>
<version>2.6.1</version>
</parent>

<artifactId>com.palantir.typescript.feature</artifactId>
Expand Down
6 changes: 6 additions & 0 deletions com.palantir.typescript.p2updatesite/.project
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
</natures>
</projectDescription>
44 changes: 22 additions & 22 deletions com.palantir.typescript.p2updatesite/category.xml
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2013 Palantir Technologies, Inc.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<site>
<feature url="features/com.palantir.typescript.feature_2.1.0.qualifier.jar" id="com.palantir.typescript.feature" version="2.1.0.qualifier">
<category name="com.palantir.typescript"/>
</feature>
<category-def name="com.palantir.typescript" label="TypeScript"/>
</site>
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright 2013 Palantir Technologies, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<site>
<feature url="features/com.palantir.typescript.feature_2.6.1.qualifier.jar" id="com.palantir.typescript.feature" version="2.6.1.qualifier">
<category name="com.palantir.typescript"/>
</feature>
<category-def name="com.palantir.typescript" label="TypeScript"/>
</site>
2 changes: 1 addition & 1 deletion com.palantir.typescript.p2updatesite/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<relativePath>../pom.xml</relativePath>
<groupId>com.palantir</groupId>
<artifactId>parent</artifactId>
<version>2.1.0.qualifier</version>
<version>2.6.1</version>
</parent>

<artifactId>com.palantir.typescript.p2updatesite</artifactId>
Expand Down
23 changes: 11 additions & 12 deletions com.palantir.typescript/.classpath
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/guava-19.0.jar" sourcepath="lib/guava-19.0-sources.jar"/>
<classpathentry kind="src" path="src"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.7.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry kind="lib" path="lib/guava-19.0.jar" sourcepath="lib/guava-19.0-sources.jar"/>
<classpathentry kind="src" path="src/"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-annotations-2.7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-core-2.7.2.jar"/>
<classpathentry exported="true" kind="lib" path="lib/jackson-databind-2.7.2.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
8 changes: 4 additions & 4 deletions com.palantir.typescript/.project
Original file line number Diff line number Diff line change
Expand Up @@ -11,22 +11,22 @@
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.ManifestBuilder</name>
<name>com.palantir.typescript.typeScriptBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.pde.SchemaBuilder</name>
<name>org.eclipse.pde.ManifestBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<name>org.eclipse.pde.SchemaBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>com.palantir.typescript.typeScriptBuilder</name>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
Expand Down
6 changes: 3 additions & 3 deletions com.palantir.typescript/.settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ org.eclipse.jdt.core.compiler.annotation.nullable=org.eclipse.jdt.annotation.Nul
org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand Down Expand Up @@ -111,7 +111,7 @@ org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=warning
org.eclipse.jdt.core.compiler.problem.unusedTypeParameter=ignore
org.eclipse.jdt.core.compiler.problem.unusedWarningToken=ignore
org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error
org.eclipse.jdt.core.compiler.source=1.6
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=20
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Expand Down
4 changes: 2 additions & 2 deletions com.palantir.typescript/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ Bundle-Localization: plugin
Bundle-ManifestVersion: 2
Bundle-Name: TypeScript
Bundle-SymbolicName: com.palantir.typescript;singleton:=true
Bundle-Version: 2.1.0.qualifier
Bundle-Version: 2.6.1.qualifier
Bundle-Activator: com.palantir.typescript.TypeScriptPlugin
Bundle-Vendor: Palantir Technologies
Require-Bundle: org.eclipse.compare,
Expand All @@ -19,7 +19,7 @@ Require-Bundle: org.eclipse.compare,
org.eclipse.ui.ide,
org.eclipse.ui.views,
org.eclipse.ui.workbench.texteditor
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: lib/guava-19.0.jar,
.,
Expand Down