Skip to content

Commit b1d0559

Browse files
authored
Merge pull request #1 from lampepfl/master
Update from parent
2 parents f31a876 + 5e4be2b commit b1d0559

File tree

2,185 files changed

+52085
-31503
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

2,185 files changed

+52085
-31503
lines changed

.drone.yml

Lines changed: 29 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,42 +20,60 @@ pipeline:
2020
# We run tests in parallel. Tests run in a copy of the working directory to avoid conflict
2121
test:
2222
group: test
23-
image: lampepfl/dotty:2019-02-06
23+
image: lampepfl/dotty:2019-04-22
2424
commands:
2525
- cp -R . /tmp/1/ && cd /tmp/1/
2626
- ./project/scripts/sbt ";compile ;test"
2727
- ./project/scripts/cmdTests
2828

2929
test_bootstrapped:
3030
group: test
31-
image: lampepfl/dotty:2019-02-06
31+
image: lampepfl/dotty:2019-04-22
3232
commands:
3333
- cp -R . /tmp/2/ && cd /tmp/2/
34-
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test ;sjsSandbox/run"
34+
- ./project/scripts/sbt ";dotty-bootstrapped/compile ;dotty-bootstrapped/test; dotty-semanticdb/compile; dotty-semanticdb/test:compile;sjsSandbox/run;sjsSandbox/test;sjsJUnitTests/test"
3535
- ./project/scripts/bootstrapCmdTests
3636

3737
community_build:
3838
group: test
39-
image: lampepfl/dotty:2019-02-06
39+
image: lampepfl/dotty:2019-04-22
4040
commands:
4141
- cp -R . /tmp/3/ && cd /tmp/3/
4242
- git submodule update --init --recursive --jobs 7
43-
- export PATH=/tmp/4/project/scripts:$PATH
44-
- sbt community-build/test
43+
- ./project/scripts/sbt community-build/test
4544

4645
test_sbt:
4746
group: test
48-
image: lampepfl/dotty:2019-02-06
47+
image: lampepfl/dotty:2019-04-22
4948
commands:
5049
- cp -R . /tmp/4/ && cd /tmp/4/
5150
- ./project/scripts/sbt sbt-dotty/scripted
5251
when:
5352
# sbt scripted tests are slow and only run on nightly or deployment
5453
event: [ tag, deployment ]
5554

55+
test_scala212:
56+
group: test
57+
image: lampepfl/dotty:2019-04-22
58+
commands:
59+
- cp -R . /tmp/5/ && cd /tmp/5/
60+
- ./project/scripts/sbt ";++2.12.8 ;compile ;test"
61+
# when:
62+
# event: [ push, tag, deployment ]
63+
64+
test_java11:
65+
group: test
66+
image: lampepfl/dotty:2019-04-22
67+
commands:
68+
- export PATH="/usr/lib/jvm/java-11-openjdk-amd64/bin:$PATH"
69+
- cp -R . /tmp/6/ && cd /tmp/6/
70+
- ./project/scripts/sbt ";compile ;test"
71+
when:
72+
event: [ push, tag, deployment ]
73+
5674
# DOCUMENTATION:
5775
documentation:
58-
image: lampepfl/dotty:2019-02-06
76+
image: lampepfl/dotty:2019-04-22
5977
commands:
6078
- ./project/scripts/genDocs
6179
secrets: [ bot_token ]
@@ -67,7 +85,7 @@ pipeline:
6785
# PUBLISHING:
6886
# Publishing expect NIGHTLYBUILD or RELEASEBUILD to be set. See dottyVersion in Build.scala
6987
publish_nightly:
70-
image: lampepfl/dotty:2019-02-06
88+
image: lampepfl/dotty:2019-04-22
7189
environment:
7290
- NIGHTLYBUILD=yes
7391
commands:
@@ -78,7 +96,7 @@ pipeline:
7896
environment: nightly
7997

8098
publish_release:
81-
image: lampepfl/dotty:2019-02-06
99+
image: lampepfl/dotty:2019-04-22
82100
environment:
83101
- RELEASEBUILD=yes
84102
commands:
@@ -102,7 +120,7 @@ pipeline:
102120
event: tag
103121

104122
publish_sbt_release:
105-
image: lampepfl/dotty:2019-02-06
123+
image: lampepfl/dotty:2019-04-22
106124
environment:
107125
- RELEASEBUILD=yes
108126
commands:

.gitignore

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,11 @@ compiler/after-pickling.txt
7575
bench/compile.txt
7676
*.dotty-ide-version
7777

78-
*.decompiled.out
79-
8078
# The vscode app for testing
8179
vscode-dotty/.vscode-test
82-
dotty-bootstrapped.version
83-
sbt-dotty.sbt
80+
81+
community-build/dotty-bootstrapped.version
82+
community-build/sbt-dotty-sbt
83+
84+
# Vulpix output files
85+
*.check.out

.gitmodules

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,3 +37,10 @@
3737
[submodule "community-build/community-projects/sourcecode"]
3838
path = community-build/community-projects/sourcecode
3939
url = https://github.com/dotty-staging/sourcecode
40+
[submodule "community-build/community-projects/scala-xml"]
41+
path = community-build/community-projects/scala-xml
42+
url = https://github.com/scala/scala-xml
43+
[submodule "community-build/community-projects/shapeless"]
44+
path = community-build/community-projects/shapeless
45+
url = https://github.com/milessabin/shapeless
46+
branch = shapeless-3

.mailmap

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Lionel Parreaux <lionel.parreaux@gmail.com>

.vscode-template/settings.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"**/*.class": true,
1010
"**/*.hasTasty": true,
1111
"**/target/": true,
12-
"tests/": true,
1312
"community-build/community-projects": true
1413
}
1514
}

README.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,6 @@ Dotty
33
[![Build Status](http://dotty-ci.epfl.ch/api/badges/lampepfl/dotty/status.svg)](http://dotty-ci.epfl.ch/lampepfl/dotty)
44
[![Join the chat at https://gitter.im/lampepfl/dotty](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/lampepfl/dotty?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
55

6-
Community build: [![Community Build Status](https://travis-ci.org/lampepfl/dotty-community-build.svg?branch=master)](https://travis-ci.org/lampepfl/dotty-community-build)
7-
86
* [Homepage](http://dotty.epfl.ch)
97
* [Documentation](http://dotty.epfl.ch/docs)
108

bench/tests/power-macro/PowerMacro.scala

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@ import scala.quoted.Expr
22

33
object PowerMacro {
44

5-
inline def power(inline n: Long, x: Double) = ~powerCode(n, '(x))
5+
inline def power(inline n: Long, x: Double) = ${powerCode(n, '{x})}
66

77
def powerCode(n: Long, x: Expr[Double]): Expr[Double] =
8-
if (n == 0) '(1.0)
9-
else if (n % 2 == 0) '{ val y = ~x * ~x; ~powerCode(n / 2, '(y)) }
10-
else '{ ~x * ~powerCode(n - 1, x) }
8+
if (n == 0) '{1.0}
9+
else if (n % 2 == 0) '{ val y = $x * $x; ${powerCode(n / 2, '{y})} }
10+
else '{ $x * ${powerCode(n - 1, x)} }
1111

1212
}

build.sbt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@ val `dotty-compiler` = Build.`dotty-compiler`
77
val `dotty-compiler-bootstrapped` = Build.`dotty-compiler-bootstrapped`
88
val `dotty-library` = Build.`dotty-library`
99
val `dotty-library-bootstrapped` = Build.`dotty-library-bootstrapped`
10+
val `dotty-library-bootstrappedJS` = Build.`dotty-library-bootstrappedJS`
1011
val `dotty-sbt-bridge` = Build.`dotty-sbt-bridge`
12+
val `dotty-sbt-bridge-tests` = Build.`dotty-sbt-bridge-tests`
1113
val `dotty-language-server` = Build.`dotty-language-server`
1214
val `dotty-bench` = Build.`dotty-bench`
1315
val `dotty-bench-bootstrapped` = Build.`dotty-bench-bootstrapped`
@@ -22,6 +24,7 @@ val `dist-bootstrapped` = Build.`dist-bootstrapped`
2224
val `community-build` = Build.`community-build`
2325

2426
val sjsSandbox = Build.sjsSandbox
27+
val sjsJUnitTests = Build.sjsJUnitTests
2528

2629
val `sbt-dotty` = Build.`sbt-dotty`
2730
val `vscode-dotty` = Build.`vscode-dotty`
Submodule algebra updated 1 file
Submodule scala-xml added at 19f53ad
Submodule scalap updated 1 file
Submodule scalatest updated 671 files
Submodule scopt updated 1 file
Submodule shapeless added at 45c8229
Submodule squants updated 1 file
Submodule stdLib213 updated 2712 files

community-build/dotty-bootstrapped.version

Lines changed: 0 additions & 1 deletion
This file was deleted.

community-build/sbt-dotty.sbt

Lines changed: 0 additions & 1 deletion
This file was deleted.

0 commit comments

Comments
 (0)