diff --git a/corpusscan/.classpath b/corpusscan/.classpath index a555877c..9b861091 100644 --- a/corpusscan/.classpath +++ b/corpusscan/.classpath @@ -4,7 +4,7 @@ - + diff --git a/gui/.classpath b/gui/.classpath index 54b4a086..46931d4b 100644 --- a/gui/.classpath +++ b/gui/.classpath @@ -4,7 +4,7 @@ - + diff --git a/pom.xml b/pom.xml index bf9e7981..177e3ab9 100644 --- a/pom.xml +++ b/pom.xml @@ -2,7 +2,7 @@ 4.0.0 - com.github.mdr + org.scalariform scalariform.parent 0.0.5-SNAPSHOT pom @@ -13,8 +13,7 @@ UTF-8 - scalariform.core - + scalariform scalariform.feature scalariform.update diff --git a/project/build.properties b/project/build.properties index 8fd7ada9..bd1190ce 100644 --- a/project/build.properties +++ b/project/build.properties @@ -1,9 +1,9 @@ #Project properties -#Thu Jul 15 13:00:04 BST 2010 +#Sat Jul 17 12:34:01 BST 2010 project.organization=- project.name=scalariform sbt.version=0.7.4 -project.version=0.0.5 +project.version=0.0.5-SNAPSHOT def.scala.version=2.7.7 build.scala.versions=2.8.0 project.initialize=false diff --git a/project/build/Project.scala b/project/build/Project.scala index 3e9a757f..b57c5a77 100644 --- a/project/build/Project.scala +++ b/project/build/Project.scala @@ -2,7 +2,7 @@ import sbt._ class Project(info: ProjectInfo) extends ParentProject(info) { - lazy val main = project("scalariform.core", "scalariform.core", new CoreProject(_)) + lazy val main = project("scalariform", "scalariform", new CoreProject(_)) lazy val gui = project("gui", "gui", new GuiProject(_), main) lazy val corpusScan = project("corpusscan", "corpusscan", new CorpusScanProject(_), main) diff --git a/scalariform.eclipse/META-INF/MANIFEST.MF b/scalariform.eclipse/META-INF/MANIFEST.MF index b38d0b74..5669b55b 100644 --- a/scalariform.eclipse/META-INF/MANIFEST.MF +++ b/scalariform.eclipse/META-INF/MANIFEST.MF @@ -4,7 +4,7 @@ Bundle-Name: Scalariform for Eclipse Bundle-SymbolicName: scalariform.eclipse;singleton:=true Bundle-Version: 0.0.5.qualifier Require-Bundle: - scalariform.core, + scalariform, org.eclipse.core.resources, org.eclipse.core.runtime, org.eclipse.jdt.core, diff --git a/scalariform.eclipse/pom.xml b/scalariform.eclipse/pom.xml index ceb74af0..72c3450e 100644 --- a/scalariform.eclipse/pom.xml +++ b/scalariform.eclipse/pom.xml @@ -4,16 +4,16 @@ 4.0.0 scalariform.parent - com.github.mdr + org.scalariform 0.0.5-SNAPSHOT - com.github.mdr + org.scalariform scalariform.eclipse 0.0.5-SNAPSHOT eclipse-plugin - com.github.mdr + org.scalariform core 0.0.5-SNAPSHOT diff --git a/scalariform.feature/feature.xml b/scalariform.feature/feature.xml index 6152c868..53b04069 100644 --- a/scalariform.feature/feature.xml +++ b/scalariform.feature/feature.xml @@ -56,7 +56,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. unpack="false"/> --> 0.0.5-SNAPSHOT scalariform.parent - com.github.mdr + org.scalariform 0.0.5-SNAPSHOT diff --git a/scalariform.update/pom.xml b/scalariform.update/pom.xml index 2940bd75..1a9ebad0 100644 --- a/scalariform.update/pom.xml +++ b/scalariform.update/pom.xml @@ -8,7 +8,7 @@ 0.0.5-SNAPSHOT scalariform.parent - com.github.mdr + org.scalariform 0.0.5-SNAPSHOT diff --git a/scalariform.core/.classpath b/scalariform/.classpath similarity index 100% rename from scalariform.core/.classpath rename to scalariform/.classpath diff --git a/scalariform.core/.project b/scalariform/.project similarity index 95% rename from scalariform.core/.project rename to scalariform/.project index 523a93fe..9d4eb528 100644 --- a/scalariform.core/.project +++ b/scalariform/.project @@ -1,6 +1,6 @@ - scalariform.core + scalariform scalariform 0.1 diff --git a/scalariform.core/META-INF/MANIFEST.MF b/scalariform/META-INF/MANIFEST.MF similarity index 88% rename from scalariform.core/META-INF/MANIFEST.MF rename to scalariform/META-INF/MANIFEST.MF index ad2e8811..39a3f07c 100644 --- a/scalariform.core/META-INF/MANIFEST.MF +++ b/scalariform/META-INF/MANIFEST.MF @@ -1,7 +1,7 @@ Manifest-Version: 1.0 Bundle-ManifestVersion: 2 Bundle-Name: Scalariform -Bundle-SymbolicName: scalariform.core +Bundle-SymbolicName: scalariform Bundle-Version: 0.0.5.qualifier Require-Bundle: org.scala-ide.scala.library diff --git a/scalariform.core/build.properties b/scalariform/build.properties similarity index 100% rename from scalariform.core/build.properties rename to scalariform/build.properties diff --git a/scalariform.core/pom.xml b/scalariform/pom.xml similarity index 90% rename from scalariform.core/pom.xml rename to scalariform/pom.xml index 4f8eeaac..996a9c90 100644 --- a/scalariform.core/pom.xml +++ b/scalariform/pom.xml @@ -2,13 +2,13 @@ 4.0.0 - com.github.mdr - scalariform.core + org.scalariform + scalariform 0.0.5-SNAPSHOT eclipse-plugin scalariform.parent - com.github.mdr + org.scalariform 0.0.5-SNAPSHOT diff --git a/scalariform/project/build.properties b/scalariform/project/build.properties new file mode 100644 index 00000000..e8f563b1 --- /dev/null +++ b/scalariform/project/build.properties @@ -0,0 +1,4 @@ +#Project properties +#Sat Jul 17 12:32:14 BST 2010 +project.name=scalariform +project.version=0.0.5.SNAPSHOT diff --git a/scalariform.core/src/main/scala/scalariform/commandline/CommandLineOptionParser.scala b/scalariform/src/main/scala/scalariform/commandline/CommandLineOptionParser.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/commandline/CommandLineOptionParser.scala rename to scalariform/src/main/scala/scalariform/commandline/CommandLineOptionParser.scala diff --git a/scalariform.core/src/main/scala/scalariform/commandline/Main.scala b/scalariform/src/main/scala/scalariform/commandline/Main.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/commandline/Main.scala rename to scalariform/src/main/scala/scalariform/commandline/Main.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/AnnotationFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/AnnotationFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/AnnotationFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/AnnotationFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/ExprFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/ExprFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/ExprFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/FormatResult.scala b/scalariform/src/main/scala/scalariform/formatter/FormatResult.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/FormatResult.scala rename to scalariform/src/main/scala/scalariform/formatter/FormatResult.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/FormatterDirectiveParser.scala b/scalariform/src/main/scala/scalariform/formatter/FormatterDirectiveParser.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/FormatterDirectiveParser.scala rename to scalariform/src/main/scala/scalariform/formatter/FormatterDirectiveParser.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/FormatterState.scala b/scalariform/src/main/scala/scalariform/formatter/FormatterState.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/FormatterState.scala rename to scalariform/src/main/scala/scalariform/formatter/FormatterState.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/ScalaFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/ScalaFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/ScalaFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/ScalaFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/SpecificFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/SpecificFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/SpecificFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/SpecificFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/TemplateFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/TemplateFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/TemplateFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/TemplateFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/TypeFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/TypeFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/TypeFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/TypeFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/XmlFormatter.scala b/scalariform/src/main/scala/scalariform/formatter/XmlFormatter.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/XmlFormatter.scala rename to scalariform/src/main/scala/scalariform/formatter/XmlFormatter.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/preferences/IFormattingPreferences.scala b/scalariform/src/main/scala/scalariform/formatter/preferences/IFormattingPreferences.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/preferences/IFormattingPreferences.scala rename to scalariform/src/main/scala/scalariform/formatter/preferences/IFormattingPreferences.scala diff --git a/scalariform.core/src/main/scala/scalariform/formatter/preferences/PreferenceDescriptor.scala b/scalariform/src/main/scala/scalariform/formatter/preferences/PreferenceDescriptor.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/formatter/preferences/PreferenceDescriptor.scala rename to scalariform/src/main/scala/scalariform/formatter/preferences/PreferenceDescriptor.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/HiddenTokens.scala b/scalariform/src/main/scala/scalariform/lexer/HiddenTokens.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/HiddenTokens.scala rename to scalariform/src/main/scala/scalariform/lexer/HiddenTokens.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/Keywords.scala b/scalariform/src/main/scala/scalariform/lexer/Keywords.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/Keywords.scala rename to scalariform/src/main/scala/scalariform/lexer/Keywords.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/Lexer.scala b/scalariform/src/main/scala/scalariform/lexer/Lexer.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/Lexer.scala rename to scalariform/src/main/scala/scalariform/lexer/Lexer.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/NewlineInferencer.scala b/scalariform/src/main/scala/scalariform/lexer/NewlineInferencer.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/NewlineInferencer.scala rename to scalariform/src/main/scala/scalariform/lexer/NewlineInferencer.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/ScalaLexer.scala b/scalariform/src/main/scala/scalariform/lexer/ScalaLexer.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/ScalaLexer.scala rename to scalariform/src/main/scala/scalariform/lexer/ScalaLexer.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/ScalaLexerException.scala b/scalariform/src/main/scala/scalariform/lexer/ScalaLexerException.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/ScalaLexerException.scala rename to scalariform/src/main/scala/scalariform/lexer/ScalaLexerException.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/ScalaLexerReader.scala b/scalariform/src/main/scala/scalariform/lexer/ScalaLexerReader.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/ScalaLexerReader.scala rename to scalariform/src/main/scala/scalariform/lexer/ScalaLexerReader.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala b/scalariform/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala rename to scalariform/src/main/scala/scalariform/lexer/ScalaOnlyLexer.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/Token.scala b/scalariform/src/main/scala/scalariform/lexer/Token.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/Token.scala rename to scalariform/src/main/scala/scalariform/lexer/Token.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/Tokens.scala b/scalariform/src/main/scala/scalariform/lexer/Tokens.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/Tokens.scala rename to scalariform/src/main/scala/scalariform/lexer/Tokens.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/UnicodeEscapeReader.scala b/scalariform/src/main/scala/scalariform/lexer/UnicodeEscapeReader.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/UnicodeEscapeReader.scala rename to scalariform/src/main/scala/scalariform/lexer/UnicodeEscapeReader.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/WhitespaceAndCommentsGrouper.scala b/scalariform/src/main/scala/scalariform/lexer/WhitespaceAndCommentsGrouper.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/WhitespaceAndCommentsGrouper.scala rename to scalariform/src/main/scala/scalariform/lexer/WhitespaceAndCommentsGrouper.scala diff --git a/scalariform.core/src/main/scala/scalariform/lexer/XmlLexer.scala b/scalariform/src/main/scala/scalariform/lexer/XmlLexer.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/lexer/XmlLexer.scala rename to scalariform/src/main/scala/scalariform/lexer/XmlLexer.scala diff --git a/scalariform.core/src/main/scala/scalariform/parser/AstNodes.scala b/scalariform/src/main/scala/scalariform/parser/AstNodes.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/parser/AstNodes.scala rename to scalariform/src/main/scala/scalariform/parser/AstNodes.scala diff --git a/scalariform.core/src/main/scala/scalariform/parser/ScalaCombinatorParser.scala b/scalariform/src/main/scala/scalariform/parser/ScalaCombinatorParser.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/parser/ScalaCombinatorParser.scala rename to scalariform/src/main/scala/scalariform/parser/ScalaCombinatorParser.scala diff --git a/scalariform.core/src/main/scala/scalariform/parser/ScalaParserException.scala b/scalariform/src/main/scala/scalariform/parser/ScalaParserException.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/parser/ScalaParserException.scala rename to scalariform/src/main/scala/scalariform/parser/ScalaParserException.scala diff --git a/scalariform.core/src/main/scala/scalariform/utils/BooleanLang.scala b/scalariform/src/main/scala/scalariform/utils/BooleanLang.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/utils/BooleanLang.scala rename to scalariform/src/main/scala/scalariform/utils/BooleanLang.scala diff --git a/scalariform.core/src/main/scala/scalariform/utils/CaseClassReflector.scala b/scalariform/src/main/scala/scalariform/utils/CaseClassReflector.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/utils/CaseClassReflector.scala rename to scalariform/src/main/scala/scalariform/utils/CaseClassReflector.scala diff --git a/scalariform.core/src/main/scala/scalariform/utils/TextEdits.scala b/scalariform/src/main/scala/scalariform/utils/TextEdits.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/utils/TextEdits.scala rename to scalariform/src/main/scala/scalariform/utils/TextEdits.scala diff --git a/scalariform.core/src/main/scala/scalariform/utils/Trimmed.scala b/scalariform/src/main/scala/scalariform/utils/Trimmed.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/utils/Trimmed.scala rename to scalariform/src/main/scala/scalariform/utils/Trimmed.scala diff --git a/scalariform.core/src/main/scala/scalariform/utils/Utils.scala b/scalariform/src/main/scala/scalariform/utils/Utils.scala similarity index 100% rename from scalariform.core/src/main/scala/scalariform/utils/Utils.scala rename to scalariform/src/main/scala/scalariform/utils/Utils.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/AbstractExpressionFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/AbstractExpressionFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/AbstractExpressionFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/AbstractExpressionFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/AbstractFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/AbstractFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/AbstractFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/AbstractFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/BlockExprFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/CaseClausesFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/CaseClausesFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/CaseClausesFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/CaseClausesFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/DefOrDclFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/DefOrDclFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/DefOrDclFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/DefOrDclFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/ForExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/ForExprFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/ForExprFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/ForExprFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/FormatterDirectiveParserTest.scala b/scalariform/src/test/scala/scalariform/formatter/FormatterDirectiveParserTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/FormatterDirectiveParserTest.scala rename to scalariform/src/test/scala/scalariform/formatter/FormatterDirectiveParserTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/IfExprFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/ImportFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/ImportFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/ImportFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/ImportFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/MiscExpressionFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/PackageFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/PackageFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/PackageFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/PackageFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/TemplateFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/TryExprFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/TypeFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/TypeFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/TypeFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/TypeFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/WhileExprFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/WhileExprFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/WhileExprFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/WhileExprFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/formatter/XmlExpressionFormatterTest.scala b/scalariform/src/test/scala/scalariform/formatter/XmlExpressionFormatterTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/formatter/XmlExpressionFormatterTest.scala rename to scalariform/src/test/scala/scalariform/formatter/XmlExpressionFormatterTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/lexer/ScalaLexerTest.scala b/scalariform/src/test/scala/scalariform/lexer/ScalaLexerTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/lexer/ScalaLexerTest.scala rename to scalariform/src/test/scala/scalariform/lexer/ScalaLexerTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/utils/TextEditTest.scala b/scalariform/src/test/scala/scalariform/utils/TextEditTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/utils/TextEditTest.scala rename to scalariform/src/test/scala/scalariform/utils/TextEditTest.scala diff --git a/scalariform.core/src/test/scala/scalariform/utils/TrimmedTest.scala b/scalariform/src/test/scala/scalariform/utils/TrimmedTest.scala similarity index 100% rename from scalariform.core/src/test/scala/scalariform/utils/TrimmedTest.scala rename to scalariform/src/test/scala/scalariform/utils/TrimmedTest.scala diff --git a/scripts/version-list.txt b/scripts/version-list.txt index 275c5f9c..6f234b86 100644 --- a/scripts/version-list.txt +++ b/scripts/version-list.txt @@ -1,11 +1,11 @@ project/build.properties pom.xml scalariform.eclipse/pom.xml -scalariform.core/pom.xml +scalariform/pom.xml scalariform.feature/pom.xml scalariform.update/pom.xml docs/source/conf.py -scalariform.core/META-INF/MANIFEST.MF +scalariform/META-INF/MANIFEST.MF scalariform.eclipse/META-INF/MANIFEST.MF scalariform.feature/feature.xml scalariform.update/site.xml