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

Proposal to convert the main codebase to Scala #600

Closed
wants to merge 99 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
99 commits
Select commit Hold shift + click to select a range
d1b8b51
Added first file
ekrich Oct 10, 2018
f08fca2
Remove Config.java
ekrich Oct 10, 2018
c638b1e
Fix package prefix to Java Set and Map to ju
ekrich Oct 10, 2018
8f8c12c
Make the build work and minimize the errors down to one.
ekrich Oct 11, 2018
43b60d0
Add parens to void methods and a dummy impl so compile will work and …
ekrich Oct 11, 2018
0aa18ff
Delegate from Scala method to Java method so tests will pass
ekrich Oct 12, 2018
8f125a2
Allow build to format code
ekrich Oct 12, 2018
bbe1c91
Convert ConfigMergeable
ekrich Oct 12, 2018
a2b1bd1
Convert ConfigValue
ekrich Oct 15, 2018
4a38198
Converted MergeableValue
ekrich Oct 17, 2018
a21b3cb
Convert ConfigNode
ekrich Oct 17, 2018
2ad2b62
Convert the rest of parser package
ekrich Oct 17, 2018
a0ae4b8
Convert remaining interfaces in config package
ekrich Oct 17, 2018
e65ef48
Convert ConfigBeanFactory
ekrich Oct 18, 2018
5271466
Convert interfaces in impl
ekrich Oct 19, 2018
f77663d
Convert DefaultConfigLoadingStrategy
ekrich Oct 19, 2018
c528988
Convert ConfigResolveOptions
ekrich Oct 30, 2018
0a48ad5
Convert ConfigRenderOptions
ekrich Oct 30, 2018
3ad9691
Convert ConfigParseOptions
ekrich Oct 30, 2018
8036115
Convert ConfigUtil
ekrich Oct 30, 2018
4c85e64
Convert ConfigValueFactory and add return to ConfigUtil
ekrich Oct 30, 2018
3d954d7
Convert ConfigOriginFactory
ekrich Oct 30, 2018
2b2bc7e
Convert ConfigMemorySize
ekrich Oct 30, 2018
7608d5d
Convert ConfigFactory
ekrich Oct 30, 2018
cc5b7be
Convert AbstractConfigNode and AbstractConfigNodeValue plus change ac…
ekrich Oct 30, 2018
1953c70
Convert Token and modify Token due to override access protected
ekrich Nov 1, 2018
c589130
Convert Tokens and add () in Java to call vals
ekrich Nov 1, 2018
4284d35
Convert BadMap
ekrich Nov 1, 2018
17a0df9
Convert MemoKey
ekrich Nov 2, 2018
9054918
Convert Parseable - ugly but passes
ekrich Nov 2, 2018
56948e3
Convert ConfigNodePath
ekrich Nov 5, 2018
01d8170
Convert ConfigNodeComplexValue - change sub classes and Scala test
ekrich Nov 7, 2018
5e49717
Convert ConfigNodeRoot, alter test for Scala
ekrich Nov 7, 2018
799115f
Convert ConfigNodeArray
ekrich Nov 7, 2018
78347b2
Forgot to add ConfigNodeArray
ekrich Nov 7, 2018
bd8afbf
Convert ConfigNodeConcatenation
ekrich Nov 7, 2018
7a8a014
Forgot ConfigNodeConcatenation
ekrich Nov 7, 2018
e68edf9
Minor changes based on ConfigNodeObject false start
ekrich Nov 7, 2018
4389595
Remove the weird looping syntax
ekrich Nov 7, 2018
4e9b431
Convert enum ConfigSyntax and change some Java call sites by adding p…
ekrich Nov 11, 2018
3fa45d6
Convert enum ConfigValueType and change some Java call sites by addin…
ekrich Nov 11, 2018
6ced9bd
Convert enum ConfigIncludeKind, fix ConfigValueType and change some J…
ekrich Nov 11, 2018
9f96a97
Convert TokenType
ekrich Nov 11, 2018
6c79e75
Convert OriginType and modify SimpleConfigOrigin
ekrich Nov 11, 2018
88f162b
Convert ResolveStatus and numerous use sites
ekrich Nov 11, 2018
0cd2e75
Convert FromMapMode and convert some use sites
ekrich Nov 11, 2018
3cf7d22
Moved package.html
ekrich Nov 11, 2018
3898e8d
Converted ConfigException, 3 test fail due to serialization and NPE d…
ekrich Nov 12, 2018
1a979af
Converted ConfigException
ekrich Nov 15, 2018
cc2ce07
Convert AbstractConfigValue and adjust subclasses and tests
ekrich Nov 16, 2018
75749e8
Convert ConfigNumber and adjust subclasses
ekrich Nov 16, 2018
368de60
Convert ConfigDouble. Make sure writeReplace method for serialization…
ekrich Nov 16, 2018
e08e698
Convert ConfigInt
ekrich Nov 16, 2018
8164040
Convert ConfigLong
ekrich Nov 16, 2018
ecba198
Convert ConfigNull
ekrich Nov 16, 2018
afb7b33
Convert ConfigBoolean
ekrich Nov 16, 2018
225bfff
Convert ConfigString
ekrich Nov 16, 2018
60dd8d5
Convert ConfigNodeSingleToken and subclass usage sites
ekrich Nov 16, 2018
50ba197
Convert ConfigNodeComment
ekrich Nov 16, 2018
780a62d
Convert ConfigNodeSimpleValue
ekrich Nov 16, 2018
eebb5eb
Convert ConfigNodeInclude
ekrich Nov 16, 2018
ced7194
Convert SimpleIncludeContext and change some equality comparisons
ekrich Nov 16, 2018
0aa0c90
Convert SubstitutionExpression and change a call site
ekrich Nov 16, 2018
e1c07d5
Convert ResolveResult and adjust Java call sites
ekrich Nov 16, 2018
c2b0a36
Convert ResolveMemos
ekrich Nov 16, 2018
cd24dfb
Convert ConfigConcatenation
ekrich Nov 16, 2018
75a28a3
Convert AbstractConfigObject, change access modifiers, and resolve pr…
ekrich Nov 16, 2018
303fe1d
Convert Path and make some minor changes to ComfigImplUtil and test
ekrich Nov 17, 2018
ef5a7be
Convert PathBuilder and one call site in Path
ekrich Nov 17, 2018
97f727b
Converted ConfigBeanImpl, was tough due to typing and resorted to man…
ekrich Nov 18, 2018
4d38560
Convert ConfigNodeField and change test and access modifier in Config…
ekrich Nov 18, 2018
60dbb8f
Converted SimpleIncluder
ekrich Nov 19, 2018
04c2886
Convert ConfigNodeObject
ekrich Nov 19, 2018
c94f756
Convert ConfigDelayedMerge, ConfigDelayedMergeObject must call static…
ekrich Nov 19, 2018
e00999d
Convert ConfigDelayedMergeObject and move package.html
ekrich Nov 19, 2018
aecac5e
Fix some types that may have been impeding progress
ekrich Nov 19, 2018
dd4a853
Remove semi colon in Scala
ekrich Nov 19, 2018
b1981a9
Convert ConfigReference and one test call site
ekrich Nov 19, 2018
4b4e4f1
Converted PropertiesParser
ekrich Nov 20, 2018
b07749d
Convert ConfigImplUtil and one call point in ConfigUtil
ekrich Nov 20, 2018
4da4f5d
Convert Tokenizer, small changes to Tokens
ekrich Nov 20, 2018
d88d38a
Convert SimpleConfigDocument and a couple of call sites on ConfigNode…
ekrich Nov 21, 2018
d6ff081
Convert ResolveContext and edit use sites
ekrich Nov 21, 2018
a103743
Convert PathParser and call sites
ekrich Nov 21, 2018
df839cf
Convert SimpleConfigObject, move trait and class into object in Abstr…
ekrich Nov 22, 2018
270a4cd
Convert ResolveSource
ekrich Nov 22, 2018
7203b8c
Convert ConfigParser, change access modifiers to a few methods
ekrich Nov 23, 2018
022c2ff
Convert ConfigDocumentParser and access modifier change
ekrich Nov 24, 2018
7e1231e
Convert SimpleConfig, make enums final, and change a few access modif…
ekrich Nov 24, 2018
87dd935
Convert SerializedConfigValue and change SimpleConfigOrigin to use
ekrich Nov 27, 2018
341030d
Converted SimpleConfigOrigin
ekrich Nov 28, 2018
894e4a6
Convert ConfigImpl and change ConfigValue factory to take AnyRef
ekrich Nov 28, 2018
834e3cb
Convert DefaultTransformer - change to one return value with the defa…
ekrich Nov 28, 2018
ceffc35
Converted last class SimpleConfigList
ekrich Nov 29, 2018
b59b69a
Remove parenthesis for parameterless methods and change tests
ekrich Nov 30, 2018
1bb3861
Minor cleanup and remove unused semicolons
ekrich Nov 30, 2018
dc73c66
Reinstate some access modifiers that were needed commented out so Jav…
ekrich Nov 30, 2018
f53d793
Prepare for cross building to 2.11 and 2.12
ekrich Dec 2, 2018
805de43
Fix for Java example applications
ekrich Dec 5, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ ThisBuild / git.baseVersion := "1.3.0"
ThisBuild / organization := "com.typesafe"
ThisBuild / Compile / scalacOptions := List("-unchecked", "-deprecation", "-feature")
ThisBuild / Test / scalacOptions := List("-unchecked", "-deprecation", "-feature")
ThisBuild / scalaVersion := "2.10.6"
ThisBuild / scalaVersion := "2.10.7" // Seq("2.10.7", "2.11.12", "2.12.7")
ThisBuild / scalacOptions ++= Seq("-deprecation") // more recommended

ThisBuild / scmInfo := Option(
ScmInfo(url("https://github.com/lightbend/config"), "scm:git@github.com:lightbend/config.git")
Expand Down Expand Up @@ -61,9 +62,15 @@ lazy val configLib = Project("config", file("config"))
.dependsOn(testLib % "test->test")
.settings(osgiSettings)
.settings(nocomma {
autoScalaLibrary := false
autoScalaLibrary := true
crossPaths := false
libraryDependencies += "net.liftweb" %% "lift-json" % "2.5" % Test
libraryDependencies += {
val liftVersion = scalaBinaryVersion.value match {
case "2.10" => "2.6.3" // last version that supports 2.10
case _ => "3.3.0" // latest version for 2.11 and 2.12
}
"net.liftweb" %% "lift-json" % liftVersion % Test
}
libraryDependencies += "com.novocode" % "junit-interface" % "0.11" % Test

Compile / compile / javacOptions ++= Seq("-source", "1.8", "-target", "1.8",
Expand Down
Loading