From aa107e8c96707209a55d8619ca4adc94507dde99 Mon Sep 17 00:00:00 2001 From: godenji Date: Sun, 29 Oct 2017 10:20:08 -0400 Subject: [PATCH 1/5] cleanup remaining maven config --- pom.xml | 182 ----------------------------------- scalariform/build.properties | 5 - scalariform/pom.xml | 29 ------ 3 files changed, 216 deletions(-) delete mode 100644 pom.xml delete mode 100644 scalariform/build.properties delete mode 100644 scalariform/pom.xml diff --git a/pom.xml b/pom.xml deleted file mode 100644 index 18d396fe..00000000 --- a/pom.xml +++ /dev/null @@ -1,182 +0,0 @@ - - - 4.0.0 - org.scalariform - scalariform.parent - 0.2.5 - pom - - - - scm:git://github.com/scala-ide/scalariform.git - https://github.com/scala-ide/scalariform - - - - UTF-8 - 0.24.0 - 2.12.3 - 1.0.6 - 1.0.6 - 2_12 - - - - scalariform - scalariform.feature - scalariform.update - - - - org.scala-lang - scala-library - ${scala.version} - - - - - - - org.eclipse.tycho - tycho-versions-plugin - ${tycho.version} - - - - - - org.eclipse.tycho - tycho-maven-plugin - ${tycho.version} - true - - - org.eclipse.tycho - target-platform-configuration - ${tycho.version} - - p2 - consider - - - - - - org.codehaus.mojo - buildnumber-maven-plugin - 1.1 - - - validate - - create - - - - - false - false - 7 - - - - - org.eclipse.tycho - tycho-packaging-plugin - ${tycho.version} - - '${scala.version.suffix}-'yyyyMMddHHmm'-${buildNumber}' - true - - - - net.alchim31.maven - scala-maven-plugin - 3.2.1 - - - - add-source - compile - - - - - ${scala.version} - - -Xmx1024m - -Xss4m - - - - - - - - neon - p2 - http://download.eclipse.org/releases/neon - - - sonatype.release - Sonatype maven release repository - https://oss.sonatype.org/content/repositories/releases/ - false - - - sonatype.snapshot - Sonatype maven snapshot repository - https://oss.sonatype.org/content/repositories/snapshots - - daily - - - - - - scala-2.10.x - - 2.10.6 - - - - scala-2.11.x - - 2.11.11 - 2.11 - - - - org.scala-lang.modules - scala-xml_${version.suffix} - ${scala.xml.version} - - - org.scala-lang.modules - scala-parser-combinators_${version.suffix} - ${scala.parser-combinators.version} - - - - - scala-2.12.x - - 2.12.3 - 2.12 - - - - org.scala-lang.modules - scala-xml_${version.suffix} - ${scala.xml.version} - - - org.scala-lang.modules - scala-parser-combinators_${version.suffix} - ${scala.parser-combinators.version} - - - - - diff --git a/scalariform/build.properties b/scalariform/build.properties deleted file mode 100644 index 4c7f4e36..00000000 --- a/scalariform/build.properties +++ /dev/null @@ -1,5 +0,0 @@ -bin.includes = META-INF/,\ - . -source.. = src/main/scala/ -jars.compile.order = . -output.. = bin/ diff --git a/scalariform/pom.xml b/scalariform/pom.xml deleted file mode 100644 index 71cc1009..00000000 --- a/scalariform/pom.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - 4.0.0 - org.scalariform - scalariform - eclipse-plugin - - scalariform.parent - org.scalariform - 0.2.5 - - - - - - - org.eclipse.tycho - tycho-compiler-plugin - ${tycho.version} - - - **/*.scala - - - - - - From f6e0ca632928e46b8242fa5fa82ee7bf505d09af Mon Sep 17 00:00:00 2001 From: godenji Date: Sun, 29 Oct 2017 10:21:52 -0400 Subject: [PATCH 2/5] remove notes archive (already integrated with changelog) --- scalariform/notes/0.0.6.markdown | 9 --------- scalariform/notes/0.0.7.markdown | 8 -------- scalariform/notes/0.0.8.markdown | 11 ----------- scalariform/notes/0.0.9.markdown | 10 ---------- scalariform/notes/0.1.0.markdown | 10 ---------- scalariform/notes/0.1.1.markdown | 12 ------------ scalariform/notes/0.1.2.markdown | 11 ----------- scalariform/notes/0.1.3.markdown | 3 --- scalariform/notes/0.1.4.markdown | 3 --- scalariform/notes/0.1.5.markdown | 8 -------- scalariform/notes/0.1.6.markdown | 6 ------ scalariform/notes/about.markdown | 3 --- 12 files changed, 94 deletions(-) delete mode 100644 scalariform/notes/0.0.6.markdown delete mode 100644 scalariform/notes/0.0.7.markdown delete mode 100644 scalariform/notes/0.0.8.markdown delete mode 100644 scalariform/notes/0.0.9.markdown delete mode 100644 scalariform/notes/0.1.0.markdown delete mode 100644 scalariform/notes/0.1.1.markdown delete mode 100644 scalariform/notes/0.1.2.markdown delete mode 100644 scalariform/notes/0.1.3.markdown delete mode 100644 scalariform/notes/0.1.4.markdown delete mode 100644 scalariform/notes/0.1.5.markdown delete mode 100644 scalariform/notes/0.1.6.markdown delete mode 100644 scalariform/notes/about.markdown diff --git a/scalariform/notes/0.0.6.markdown b/scalariform/notes/0.0.6.markdown deleted file mode 100644 index c621c56e..00000000 --- a/scalariform/notes/0.0.6.markdown +++ /dev/null @@ -1,9 +0,0 @@ -* Lexer performance tweaks -* FIX: whitespace in XML end tags (e.g. ``) -* Tweak multiline case clause indentation -* FIX: indentation problem with xml in StatSeq -* Disallow staircase expression breaks before commas and colons -* FIX: incorrect indentation within multiple param clauses -* Improved formatting for case blocks -* Command line tool learned `--encoding=` option -* FIX: honour previously-ignored formatXml preference diff --git a/scalariform/notes/0.0.7.markdown b/scalariform/notes/0.0.7.markdown deleted file mode 100644 index 3b20d51b..00000000 --- a/scalariform/notes/0.0.7.markdown +++ /dev/null @@ -1,8 +0,0 @@ -* Rewrite parser; formatter is now ~60% faster -* Add IndentPackageBlocks formatting preference -* Allow newline before self type declaration -* FIX: avoid abutting `@` and an operator, otherwise it merges into a single identifer -* FIX: formatting for newline between `private[foo]` and trait/class/def etc -* Update parser to match changes from Scala trac #3672 (types on implicit parameters in function expressions) -* FIX: avoid hash and operator merging (e.g. `b[c# ::[d]]`) -* Tweaks to else clause formatting diff --git a/scalariform/notes/0.0.8.markdown b/scalariform/notes/0.0.8.markdown deleted file mode 100644 index 0d3f35fe..00000000 --- a/scalariform/notes/0.0.8.markdown +++ /dev/null @@ -1,11 +0,0 @@ -* FIX: Correctly handle use of `+`/`-` as type parameters in defs -* Add Maven formatter plugin (contributed by Adam Crain -- [Adam Crain][1]) -* FIX: Bug with lexing `"""` at end of text -* Add `AlignSingleLineCaseStatements` preferences to align the arrows of consecutive single-line case statements -* Add `IndentLocalDefs` preference to indent local methods an extra level -* Track parser changes in Scala 2.9: - * Type variables in a constructor pattern match - * Generalised catch clause - * Mirror code reorganisation of scala.tools.nsc.ast.parser.Parsers - - [1]: https://github.com/jadamcrain diff --git a/scalariform/notes/0.0.9.markdown b/scalariform/notes/0.0.9.markdown deleted file mode 100644 index a5408047..00000000 --- a/scalariform/notes/0.0.9.markdown +++ /dev/null @@ -1,10 +0,0 @@ -* Add support for AST selection -* Improve basic formatting of Scaladoc comments -* Improve stairway indenting of argument lists, infix exprs -* Add preference `PreserveDanglingCloseParenthesis` to keep newlines before a dangling right paren (issue #6) -* Allow single-expression case clauses to be formatted adjacent to the case arrow (issue #7) -* Improve formatting after a single-line comment (issue #8) -* Allow missing param types for `-Yinfer-argument-types` (issue #9) -* FIX: erroneous spaces after `type` (issue #10) -* Add `--forceOutput` command-line argument to pass input through untouched if there is a parse error (#issue 11/12) -* Pull out separate, non-`System.exit()`ing `process` method separate to `main()` (issue #13) diff --git a/scalariform/notes/0.1.0.markdown b/scalariform/notes/0.1.0.markdown deleted file mode 100644 index 4686b7b0..00000000 --- a/scalariform/notes/0.1.0.markdown +++ /dev/null @@ -1,10 +0,0 @@ -* Add forgiving mode to lexer -* Add `SpaceInsideParentheses` and `SpaceInsideBrackets` preferences (issue #14) -* Ability to import/export preferences as properties; `--preferencesFile=` command-line option -* FIX: incorrect indent behaviour for finally block after a catch block -* Add `SpacesWithinPatternBinders` preference (issue #15) -* Add `MultilineScaladocCommentsStartOnFirstLine` preference (issue #16) -* FIX: infinite loop in lexer on malformed XML processing instructions / unparsed -* Add IndentWithTabs preference (issue #17) -* FIX: Fix incorrectly parsed command line argument (issue #20) -* Update for 2.9.0 diff --git a/scalariform/notes/0.1.1.markdown b/scalariform/notes/0.1.1.markdown deleted file mode 100644 index 476de7fb..00000000 --- a/scalariform/notes/0.1.1.markdown +++ /dev/null @@ -1,12 +0,0 @@ -* FIX: Leave PCDATA whitespace untouched inside a single-line XML tag (issue #27) -* FIX: indent for `indentLocalDefs` on first line of function block (issue #24) -* `ParenExpr` now allows newline after opening paren (issue #18) -* FIX: spurious indentation in staggered dot expressions (issue #25) -* Preserve newline before annotations (issue #28) -* Add option to support `CompactControlReadability` style (issue #22) (thanks to by Owein Reese (https://github.com/wheaties) and Rose Toomey (https://github.com/rktoomey) for the patch -* Preserve newline before anonymous function argument (issue #21) -* Allow one-line anonymous function blocks -* Fix parser crash on argument-less constructor annotations -* Add `PlaceScaladocAsterisksBeneathSecondAsterisk` preference to conform to recommended Scaladoc style (issue #30) -* FIX: Removal of space causing token merge in varargs and unary ops (http://scala-ide-portfolio.assembla.com/spaces/scala-ide/tickets/1000601) -* Switch to sbt 0.11 build diff --git a/scalariform/notes/0.1.2.markdown b/scalariform/notes/0.1.2.markdown deleted file mode 100644 index 0fc90595..00000000 --- a/scalariform/notes/0.1.2.markdown +++ /dev/null @@ -1,11 +0,0 @@ -* Revamp command-line tool with more intuitive behaviour -* Add `--quiet`, `--recurse`, `--stdin`, `--stdout` options to command-line tool -* FIX: Scaladoc comment formatting could break nested comments (issue #36) -* Tidy up, optimise lexer code -* FIX: Parse `5.f`, `5.d` as floating points, unless in Scala 2.11+ mode -* FIX: Bug with line-per-annotation style -* Add support for String interpolation -* Add support for macros -* Add `--scalaVersion=` flag to command-line tool -* Support `expr[T1, T2][T3, T4]` and `g()[String]` syntaxes -* Fix AST selection for prefix expression diff --git a/scalariform/notes/0.1.3.markdown b/scalariform/notes/0.1.3.markdown deleted file mode 100644 index 267484b9..00000000 --- a/scalariform/notes/0.1.3.markdown +++ /dev/null @@ -1,3 +0,0 @@ -* Add `EOF` to `ComplilationUnit`, ensuring entire source is represented in the tree -* Support `$this` references in String interpolation -* Update build to sbt 0.12.0 diff --git a/scalariform/notes/0.1.4.markdown b/scalariform/notes/0.1.4.markdown deleted file mode 100644 index 61370721..00000000 --- a/scalariform/notes/0.1.4.markdown +++ /dev/null @@ -1,3 +0,0 @@ -* FIX: Allow declarations as last statement in case block (issue #60) -* Update to build 2.10 final - diff --git a/scalariform/notes/0.1.5.markdown b/scalariform/notes/0.1.5.markdown deleted file mode 100644 index 953874ef..00000000 --- a/scalariform/notes/0.1.5.markdown +++ /dev/null @@ -1,8 +0,0 @@ -* FIX: Type formatter crash on multiline types -* Track scalac parser -- allow trait-position parents to have parameter blocks -* Sync changes to InferredSemicolonParser -* FIX: Scaladoc formatting wasn't idempotent (issue #62) -* Added "SpacesAroundMultiImports" option -* Modified "AlignParameters" option to align by column -- see readme -* Deprecated "PreserveDanglingCloseParenthesis" in favor of - automatic parentheses level detection. diff --git a/scalariform/notes/0.1.6.markdown b/scalariform/notes/0.1.6.markdown deleted file mode 100644 index f304d976..00000000 --- a/scalariform/notes/0.1.6.markdown +++ /dev/null @@ -1,6 +0,0 @@ -* FIX: Bug in parser prevented DOT characters inside type parameters (issue #44) -* Newline no longer added for each function in `=> => =>` scenarios (issue #45) -* Update build to sbt 0.13.7 and update java version validation (PR #42) -* Rewrite -> into → when RewriteArrowSymbols is on (issue #34) -* Sync maven build with sbt build (PR #22) -* Add support for Scala 2.12 in the maven build (PR #20) diff --git a/scalariform/notes/about.markdown b/scalariform/notes/about.markdown deleted file mode 100644 index bd6418b7..00000000 --- a/scalariform/notes/about.markdown +++ /dev/null @@ -1,3 +0,0 @@ -[Scalariform][1] is a source code formatter for Scala. - -[1]: http://github.com/mdr/scalariform From b258e01ac0f5492e7914f3a288c6e5b864e0682e Mon Sep 17 00:00:00 2001 From: godenji Date: Sun, 29 Oct 2017 10:31:34 -0400 Subject: [PATCH 3/5] update contrib --- CONTRIBUTORS | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 396aec89..52686c79 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -1,4 +1,8 @@ -Scalariform is maintained by Matt Russell (https://github.com/mdr/scalariform). +Scalariform was created by Matt Russell (https://github.com/mdr/scalariform) + +The library is maintained by N.S. Cutler (https://github.com/godenji) + +For the full list of contributors please visit (https://github.com/scala-ide/scalariform/graphs/contributors) * A command line option to read a list of files was contributed by Olivier Michallat (https://github.com/olim7t). * The Maven formatter plugin was written by Adam Crain (https://github.com/jadamcrain). From 44ced95c2c703df47ffbb5e9d843a3e0c913b40c Mon Sep 17 00:00:00 2001 From: godenji Date: Sun, 29 Oct 2017 10:32:21 -0400 Subject: [PATCH 4/5] bump version to next dev --- version.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.sbt b/version.sbt index 39eecbcb..7638ea5f 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.2.5" +version in ThisBuild := "0.2.6-SNAPSHOT" From 16befb2e4d291eb39c94a589eb458d41e057c8cb Mon Sep 17 00:00:00 2001 From: godenji Date: Sun, 29 Oct 2017 10:39:44 -0400 Subject: [PATCH 5/5] 0.2.6 release --- CHANGELOG | 4 ++++ README.rst | 2 +- version.sbt | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 2a325eb1..74541f0d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ +0.2.6 (29/October/17) + +* Removed OSGi configuration, no longer needed for Scala-IDE (PR #258 by @sschaef) + 0.2.5 (27/October/17) * Added support for single case pattern without forced newline (fixes #29) diff --git a/README.rst b/README.rst index 467e4c81..72bcc222 100644 --- a/README.rst +++ b/README.rst @@ -52,7 +52,7 @@ Usage within a project Have a use for the scalariform source code directly? You can use it as a build dependency: :: - "org.scalariform" %% "scalariform" % "0.2.5" + "org.scalariform" %% "scalariform" % "0.2.6" Integration with Eclipse ------------------------ diff --git a/version.sbt b/version.sbt index 7638ea5f..a9721bef 100644 --- a/version.sbt +++ b/version.sbt @@ -1 +1 @@ -version in ThisBuild := "0.2.6-SNAPSHOT" +version in ThisBuild := "0.2.6"