Skip to content

Commit b1bec28

Browse files
authored
Merge branch 'master' into template
2 parents e35ecd9 + 761de1f commit b1bec28

28 files changed

+4105
-7
lines changed

Diff for: .gitignore

+29
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
1+
*.class
2+
*.log
3+
*.sjsir
4+
5+
# sbt specific
6+
.cache
7+
.history
8+
.lib/
9+
dist/*
110
target/
11+
lib_managed/
12+
src_managed/
13+
project/boot/
14+
project/plugins/project/
15+
16+
# Scala-IDE specific
17+
.scala_dependencies
18+
.worksheet
19+
.cache-*
20+
21+
# IntelliJ specific
22+
.idea/
23+
.classpath
24+
.project
25+
.settings/
26+
27+
# jenv
28+
.java-version
29+
30+
# Files created for deployment
231
local.sbt
332
secret/
433
.metals/

Diff for: .sbtopts

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-J-Xss5m
2+
-J-XX:MaxMetaspaceSize=9999g

Diff for: .scalafmt.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version = "2.2.2"
1+
version = "2.5.3"
22
maxColumn = 120

Diff for: .travis.yml

+8-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ addons:
66
language: scala
77

88
scala:
9-
- 2.12.8
9+
- 2.13.4
1010

1111
jdk:
1212
- openjdk11
@@ -28,9 +28,15 @@ before_deploy:
2828

2929
deploy:
3030
- provider: script
31-
script: sbt ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease
31+
script: sbt $SBT_ARGS ++$TRAVIS_SCALA_VERSION "set every Seq(sonatypeSessionName := \"Travis Job $TRAVIS_JOB_NAME $TRAVIS_JOB_NUMBER ($TRAVIS_JOB_WEB_URL)\", publishTo := sonatypePublishToBundle.value)" publishSigned sonatypeBundleRelease
3232
cleanup: false
3333
edge: true
3434
on:
3535
all_branches: true
3636
condition: $GITHUB_PERSONAL_ACCESS_TOKEN
37+
38+
env:
39+
- SBT_ARGS=
40+
- SBT_ARGS=--addPluginSbtFile=project/plugins.sbt.scala-js.0.6
41+
42+
sbt_args: $SBT_ARGS

Diff for: Binding/.js/build.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../build.sbt.shared

Diff for: Binding/.jvm/build.sbt

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../build.sbt.shared

Diff for: Binding/build.sbt.shared

+13
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
description := "Reactive data-binding for Scala. This artifact is available for both Scala.js and JVM."
2+
3+
libraryDependencies += "com.thoughtworks.enableIf" %% "enableif" % "1.1.7"
4+
5+
libraryDependencies += "com.thoughtworks.sde" %%% "core" % "3.3.4"
6+
7+
libraryDependencies += "org.scalatest" %%% "scalatest" % "3.1.2" % Test
8+
9+
libraryDependencies += "org.scala-lang" % "scala-reflect" % scalaVersion.value
10+
11+
libraryDependencies += "org.scala-lang" % "scala-compiler" % scalaVersion.value % Provided
12+
13+
scalacOptions += "-Ymacro-annotations"

0 commit comments

Comments
 (0)