Skip to content

Commit 9cdd77d

Browse files
godenjigodenji
authored
Merge pull request #246 from godenji/0.2.2
0.2.2 release
2 parents 6eb5041 + d3d4ca8 commit 9cdd77d

File tree

23 files changed

+352
-36
lines changed

23 files changed

+352
-36
lines changed

‎.gitignore

+2-13
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,13 @@
11
target/
2+
!scalariform.update/target/
23
lib_managed/
34
src_managed/
4-
project/boot/
55
bin/
6-
.scala_dependencies
7-
core/target/
8-
core/lib_managed/
9-
core/src_managed/
10-
gui/target/
11-
gui/lib_managed/
12-
gui/src_managed/
13-
corpusscan/target/
14-
corpusscan/lib_managed/
15-
corpusscan/src_managed/
16-
docs/build
17-
nohup.out
186
.history
197
.cache
208
.idea/
219
.settings
2210
.classpath
2311
.project
2412
.cache*
13+
*~

‎CHANGELOG

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
0.2.2 (19/July/17)
2+
3+
* Added IDE friendly preference descriptors
4+
* Added Maven components for generating Eclipse update site
5+
* Uploaded generated Eclipse update site
6+
17
0.2.1 (14/July/17)
28

39
* FIX: Revert removal of DoubleIndentClassDeclaration which was erroneously marked as having been deprecated since scalariform 0.1.5 (in reality the deprecation occurred in 0.2.0-snapshot)

‎README.rst

+11-4
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ Usage within a project
5252

5353
Have a use for the scalariform source code directly? You can use it as a build dependency: ::
5454

55-
"org.scalariform" %% "scalariform" % "0.2.1"
55+
"org.scalariform" %% "scalariform" % "0.2.2"
5656

5757
Integration with Eclipse
5858
------------------------
@@ -71,6 +71,11 @@ To set preferences, go to either
7171
- Window -> Preferences -> Scala -> Editor -> Formatter
7272
- Project -> Properties -> Scala Formatter
7373

74+
From the formatter preference window you can import/export existing preferences.
75+
See the `reference.conf`_ for a listing of all available preferences and their defaults.
76+
77+
.. _reference.conf: https://github.com/scala-ide/scalariform/blob/master/formatterPreferences.properties
78+
7479
Integration with Emacs/ENSIME
7580
-----------------------------
7681

@@ -132,7 +137,7 @@ Usage (Gradle 2.1 and above)::
132137
alignParameters = true
133138
alignSingleLineCaseStatements = true
134139
}
135-
140+
136141
formatAllScala
137142

138143
See `the documentation`_ for further usage examples.
@@ -159,7 +164,9 @@ the following to ``.vimrc`` ::
159164
au BufEnter *.scala setl equalprg=java\ -jar\ /home/me/bin/scalariform.jar\ -f\ -q\ +compactControlReadability\ +alignParameters\ +alignSingleLineCaseStatements\ +doubleIndentConstructorArguments\ +rewriteArrowSymbols\ +preserveSpaceBeforeArguments\ --stdin\ --stdout
160165

161166

162-
You can create your own executable scalariform.jar by following the instructions at the top of this file, in "Packaging an executable JAR."
167+
Download scalariform.jar from the `latest release`_
168+
169+
.. _latest release: https://github.com/scala-ide/scalariform/releases/latest
163170

164171
Command line tool
165172
-----------------
@@ -396,7 +403,7 @@ becomes:
396403
If ``Preserve``, scalariform will try to match what unformatted source code is already doing per parenthesis,
397404
either forcing or preventing.
398405

399-
doubleIndentClassDeclaration
406+
~~doubleIndentClassDeclaration~~ (Deprecated, use `doubleIndentConstructorArguments`)
400407
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
401408

402409
Default: ``false``

‎cli/src/main/scala/scalariform/Utils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package scalariform
22

33
object Utils {
44
def writeText(file: java.io.File, text: String, encodingOpt: Option[String] = None) {
5-
import java.io.{ OutputStreamWriter, FileOutputStream }
5+
import java.io.{OutputStreamWriter, FileOutputStream}
66
val encoding = encodingOpt getOrElse (System getProperty "file.encoding")
77
val writer = new OutputStreamWriter(new FileOutputStream(file), encoding)
88
try

‎cli/src/main/scala/scalariform/commandline/ScalaFileWalker.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package scalariform.commandline
22

33
import java.io.File
4-
import java.util.{ ArrayList, Collection }
4+
import java.util.{ArrayList, Collection}
55
import scala.collection.JavaConverters._
66

77
import org.apache.commons.io._

‎pom.xml

+182
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,182 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
3+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
4+
<modelVersion>4.0.0</modelVersion>
5+
<groupId>org.scalariform</groupId>
6+
<artifactId>scalariform.parent</artifactId>
7+
<version>0.2.2</version>
8+
<packaging>pom</packaging>
9+
10+
<!-- scm configuration is require to extract the github hash-->
11+
<scm>
12+
<connection>scm:git://github.com/scala-ide/scalariform.git</connection>
13+
<url>https://github.com/scala-ide/scalariform</url>
14+
</scm>
15+
16+
<properties>
17+
<encoding>UTF-8</encoding>
18+
<tycho.version>0.24.0</tycho.version>
19+
<scala.version>2.12.2</scala.version>
20+
<scala.xml.version>1.0.6</scala.xml.version>
21+
<scala.parser-combinators.version>1.0.6</scala.parser-combinators.version>
22+
<scala.version.suffix>2_12</scala.version.suffix>
23+
</properties>
24+
25+
<modules>
26+
<module>scalariform</module>
27+
<module>scalariform.feature</module>
28+
<module>scalariform.update</module>
29+
</modules>
30+
<dependencies>
31+
<dependency>
32+
<groupId>org.scala-lang</groupId>
33+
<artifactId>scala-library</artifactId>
34+
<version>${scala.version}</version>
35+
</dependency>
36+
</dependencies>
37+
<build>
38+
<pluginManagement>
39+
<plugins>
40+
<plugin>
41+
<groupId>org.eclipse.tycho</groupId>
42+
<artifactId>tycho-versions-plugin</artifactId>
43+
<version>${tycho.version}</version>
44+
</plugin>
45+
</plugins>
46+
</pluginManagement>
47+
<plugins>
48+
<plugin>
49+
<groupId>org.eclipse.tycho</groupId>
50+
<artifactId>tycho-maven-plugin</artifactId>
51+
<version>${tycho.version}</version>
52+
<extensions>true</extensions>
53+
</plugin>
54+
<plugin>
55+
<groupId>org.eclipse.tycho</groupId>
56+
<artifactId>target-platform-configuration</artifactId>
57+
<version>${tycho.version}</version>
58+
<configuration>
59+
<resolver>p2</resolver>
60+
<pomDependencies>consider</pomDependencies>
61+
</configuration>
62+
</plugin>
63+
<!-- git hash extractor -->
64+
<plugin>
65+
<!-- plugin used to extract the git hash and store it in ${buildNumber} -->
66+
<groupId>org.codehaus.mojo</groupId>
67+
<artifactId>buildnumber-maven-plugin</artifactId>
68+
<version>1.1</version>
69+
<executions>
70+
<execution>
71+
<phase>validate</phase>
72+
<goals>
73+
<goal>create</goal>
74+
</goals>
75+
</execution>
76+
</executions>
77+
<configuration>
78+
<doCheck>false</doCheck>
79+
<doUpdate>false</doUpdate>
80+
<shortRevisionLength>7</shortRevisionLength>
81+
</configuration>
82+
</plugin>
83+
<!-- for setting a better qualifier -->
84+
<plugin>
85+
<groupId>org.eclipse.tycho</groupId>
86+
<artifactId>tycho-packaging-plugin</artifactId>
87+
<version>${tycho.version}</version>
88+
<configuration>
89+
<format>'${scala.version.suffix}-'yyyyMMddHHmm'-${buildNumber}'</format>
90+
<archiveSite>true</archiveSite>
91+
</configuration>
92+
</plugin>
93+
<plugin>
94+
<groupId>net.alchim31.maven</groupId>
95+
<artifactId>scala-maven-plugin</artifactId>
96+
<version>3.2.1</version>
97+
<executions>
98+
<execution>
99+
<goals>
100+
<goal>add-source</goal>
101+
<goal>compile</goal>
102+
</goals>
103+
</execution>
104+
</executions>
105+
<configuration>
106+
<scalaVersion>${scala.version}</scalaVersion>
107+
<jvmArgs>
108+
<jvmArg>-Xmx1024m</jvmArg>
109+
<jvmArg>-Xss4m</jvmArg>
110+
</jvmArgs>
111+
</configuration>
112+
</plugin>
113+
</plugins>
114+
</build>
115+
<repositories>
116+
<repository>
117+
<id>neon</id>
118+
<layout>p2</layout>
119+
<url>http://download.eclipse.org/releases/neon</url>
120+
</repository>
121+
<repository>
122+
<id>sonatype.release</id>
123+
<name>Sonatype maven release repository</name>
124+
<url>https://oss.sonatype.org/content/repositories/releases/</url>
125+
<snapshots><enabled>false</enabled></snapshots>
126+
</repository>
127+
<repository>
128+
<id>sonatype.snapshot</id>
129+
<name>Sonatype maven snapshot repository</name>
130+
<url>https://oss.sonatype.org/content/repositories/snapshots</url>
131+
<snapshots>
132+
<updatePolicy>daily</updatePolicy>
133+
</snapshots>
134+
</repository>
135+
</repositories>
136+
<profiles>
137+
<profile>
138+
<id>scala-2.10.x</id>
139+
<properties>
140+
<scala.version>2.10.6</scala.version>
141+
</properties>
142+
</profile>
143+
<profile>
144+
<id>scala-2.11.x</id>
145+
<properties>
146+
<scala.version>2.11.11</scala.version>
147+
<version.suffix>2.11</version.suffix>
148+
</properties>
149+
<dependencies>
150+
<dependency>
151+
<groupId>org.scala-lang.modules</groupId>
152+
<artifactId>scala-xml_${version.suffix}</artifactId>
153+
<version>${scala.xml.version}</version>
154+
</dependency>
155+
<dependency>
156+
<groupId>org.scala-lang.modules</groupId>
157+
<artifactId>scala-parser-combinators_${version.suffix}</artifactId>
158+
<version>${scala.parser-combinators.version}</version>
159+
</dependency>
160+
</dependencies>
161+
</profile>
162+
<profile>
163+
<id>scala-2.12.x</id>
164+
<properties>
165+
<scala.version>2.12.2</scala.version>
166+
<version.suffix>2.12</version.suffix>
167+
</properties>
168+
<dependencies>
169+
<dependency>
170+
<groupId>org.scala-lang.modules</groupId>
171+
<artifactId>scala-xml_${version.suffix}</artifactId>
172+
<version>${scala.xml.version}</version>
173+
</dependency>
174+
<dependency>
175+
<groupId>org.scala-lang.modules</groupId>
176+
<artifactId>scala-parser-combinators_${version.suffix}</artifactId>
177+
<version>${scala.parser-combinators.version}</version>
178+
</dependency>
179+
</dependencies>
180+
</profile>
181+
</profiles>
182+
</project>

‎project/project/plugins.sbt

-1
This file was deleted.

‎scalariform.feature/build.properties

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
bin.includes = feature.xml

‎scalariform.feature/feature.xml

+55
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,55 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature
3+
id="scalariform.feature"
4+
label="Scalariform"
5+
version="0.2.2">
6+
7+
<description>
8+
Scala Code formatter
9+
</description>
10+
11+
<license>
12+
The MIT License
13+
14+
Copyright (c) 2010 Matthew D. Russell
15+
16+
Permission is hereby granted, free of charge, to any person obtaining
17+
a copy of this software and associated documentation files (the
18+
&quot;Software&quot;), to deal in the Software without restriction, including
19+
without limitation the rights to use, copy, modify, merge, publish,
20+
distribute, sublicense, and/or sell copies of the Software, and
21+
to permit persons to whom the Software is furnished to do so,
22+
subject to the following conditions:
23+
24+
The above copyright notice and this permission notice shall be
25+
included in all copies or substantial portions of the Software.
26+
27+
THE SOFTWARE IS PROVIDED &quot;AS IS&quot;, WITHOUT WARRANTY OF ANY KIND,
28+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
29+
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
30+
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
31+
FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
32+
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
33+
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
34+
</license>
35+
36+
<requires>
37+
<import plugin="org.eclipse.core.resources"/>
38+
<import plugin="org.eclipse.core.runtime"/>
39+
<import plugin="org.eclipse.jdt.core"/>
40+
<import plugin="org.eclipse.jdt.ui"/>
41+
<import plugin="org.eclipse.jface.text"/>
42+
<import plugin="org.eclipse.text"/>
43+
<import plugin="org.eclipse.ui"/>
44+
<import plugin="org.eclipse.ui.editors"/>
45+
<import plugin="org.eclipse.ui.views"/>
46+
</requires>
47+
48+
<plugin
49+
id="scalariform"
50+
download-size="0"
51+
install-size="0"
52+
version="0.0.0"
53+
unpack="false"/>
54+
55+
</feature>

‎scalariform.feature/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>scalariform.feature</artifactId>
7+
<packaging>eclipse-feature</packaging>
8+
<parent>
9+
<artifactId>scalariform.parent</artifactId>
10+
<groupId>org.scalariform</groupId>
11+
<version>0.2.2</version>
12+
</parent>
13+
</project>

‎scalariform.update/pom.xml

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<project
3+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"
4+
xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
5+
<modelVersion>4.0.0</modelVersion>
6+
<artifactId>scalariform.update</artifactId>
7+
<packaging>eclipse-update-site</packaging>
8+
<parent>
9+
<artifactId>scalariform.parent</artifactId>
10+
<groupId>org.scalariform</groupId>
11+
<version>0.2.2</version>
12+
</parent>
13+
</project>

‎scalariform.update/site.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<description name="Scalariform Update Site"
4+
url="https://github.com/scala-ide/scalariform/tree/0.2.2/scalariform.update/target/site">
5+
Scalariform Update Site
6+
</description>
7+
<feature url="features/scalariform.feature_0.2.2.jar" version="0.2.2" id="scalariform.feature">
8+
<category name="Scala"/>
9+
</feature>
10+
<category-def name="Scala" label="Scala"/>
11+
</site>

‎scalariform.update/target/site.zip

355 Bytes
Binary file not shown.

‎scalariform.update/target/site/artifacts.jar

652 Bytes
Binary file not shown.

‎scalariform.update/target/site/content.jar

1.81 KB
Binary file not shown.

‎scalariform.update/target/site/features/scalariform.feature_0.2.2.jar

1.37 KB
Binary file not shown.

‎scalariform.update/target/site/plugins/scalariform_0.2.2.jar

1.2 MB
Binary file not shown.

‎scalariform.update/target/site/site.xml

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<site>
3+
<description name="Scalariform Update Site"
4+
url="https://github.com/scala-ide/scalariform/tree/0.2.2/scalariform.update/target/site">
5+
Scalariform Update Site
6+
</description>
7+
<feature url="features/scalariform.feature_0.2.2.jar" version="0.2.2" id="scalariform.feature">
8+
<category name="Scala"/>
9+
</feature>
10+
<category-def name="Scala" label="Scala"/>
11+
</site>

‎scalariform.update/target/site_assembly.zip

1.15 MB
Binary file not shown.

0 commit comments

Comments
 (0)