Skip to content
This repository was archived by the owner on Sep 1, 2020. It is now read-only.

Commit cc05b33

Browse files
committed
Merge pull request #98 from typelevel/update-typesafe
Update fork from upstream repo
2 parents dde3b63 + ff28980 commit cc05b33

File tree

238 files changed

+723
-307
lines changed

Some content is hidden

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

238 files changed

+723
-307
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ A pull request should consist of commits with messages that clearly state what p
8686

8787
Commit logs should be stated in the active, present tense.
8888

89-
A commit's subject should be 60 characters or less. Overall, think of
89+
A commit's subject should be 72 characters or less. Overall, think of
9090
the first line of the commit as a description of the action performed
9191
by the commit on the code base, so use the active voice and the
9292
present tense. That also makes the commit subjects easy to reuse in
@@ -113,7 +113,7 @@ Our pull request bot, Scabot, automatically builds all the commits in a PR indiv
113113

114114
Click on the little x next to a commit sha to go to the overview of the PR validation job. To diagnose a failure, consult the console output of the job that failed.
115115

116-
See the [scala-jenkins-infra repo](https://github.com/scala/scala-jenkins-infra) and [Scabot repo](https://github.com/) for full details on PR validation. One tip you should know is that commenting `/rebuild` on a PR asks validation to be run again on the same commits. This is only necessary when a spurious failure occurred.
116+
See the [scala-jenkins-infra repo](https://github.com/scala/scala-jenkins-infra) and [Scabot repo](https://github.com/scala/scabot) for full details on PR validation. One tip you should know is that commenting `/rebuild` on a PR asks validation to be run again on the same commits. This is only necessary when a spurious failure occurred.
117117

118118
### Pass code review
119119

README.md

Lines changed: 68 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,72 @@ scalaVersion := "2.11.3-typelevel"
4343

4444
libraryDependencies += "org.scala-lang" % "scala-typelevel" % scalaVersion.value
4545

46-
resolvers += Resolver.mavenLocal
46+
- Run `ant init` to download some necessary jars.
47+
- Import the project (in `src/eclipse`) via `File` `Import Existing Projects into Workspace`. Check all projects and click ok.
48+
49+
For important details on building, debugging and file encodings, please see [the excellent tutorial on scala-ide.org](http://scala-ide.org/docs/tutorials/scalac-trunk/index.html) and the included README.md in src/eclipse.
50+
51+
### IntelliJ 14
52+
Use the latest IntelliJ IDEA release and install the Scala plugin from within the IDE.
53+
54+
The following steps are required to use IntelliJ IDEA on Scala trunk
55+
- Run `ant init`. This will download some JARs to `./build/deps`, which are included in IntelliJ's classpath.
56+
- Run `./src/intellij/setup.sh`.
57+
- Open `./src/intellij/scala.ipr` in IntelliJ.
58+
- `File` `Project Structure` `Project` `Project SDK`. Create an SDK entry named "1.6" containing the Java 1.6 SDK.
59+
(You may use a later SDK for local development, but the CI will verify against Java 6.)
60+
61+
Compilation within IDEA is performed in `-Dlocker.skip=1` mode: the sources are built
62+
directly using the STARR compiler (which is downloaded from [the Central Repository](http://central.sonatype.org/), according to `starr.version` in `versions.properties`).
63+
64+
## Building with sbt (EXPERIMENTAL)
65+
66+
The experimental sbt-based build definition has arrived! Run `sbt package`
67+
to build the compiler. You can run `sbt test` to run unit (JUnit) tests.
68+
Use `sbt test/it:test` to run integration (partest) tests.
69+
70+
We would like to migrate to sbt build as quickly as possible. If you would
71+
like to help please use the scala-internals mailing list to discuss your
72+
ideas and coordinate your effort with others.
73+
74+
## Building with Ant
75+
76+
NOTE: we are working on migrating the build to sbt.
77+
78+
Run `ant build-opt` to build an optimized version of the compiler.
79+
Verify your build using `ant test-opt`.
80+
81+
The Scala build system is based on Apache Ant. Most required pre-compiled
82+
libraries are part of the repository (in 'lib/'). The following however is
83+
assumed to be installed on the build machine: TODO
84+
85+
### Ant Tips and tricks
86+
87+
Here are some common commands. Most ant targets offer a `-opt` variant that runs under `-optimise` (CI runs the -optimize variant).
88+
89+
Command | Description
90+
----------------------- | -----------
91+
`./pull-binary-libs.sh` | downloads all binary artifacts associated with this commit.
92+
`ant -p` | prints out information about the commonly used ant targets.
93+
`ant` or `ant build` | A quick compilation (to `build/quick`) of your changes using the locker compiler.
94+
`ant dist` | builds a distribution in 'dists/latest'.
95+
`ant all.clean` | removes all build files and all distributions.
96+
97+
A typical debug cycle incrementally builds quick, then uses it to compile and run the file
98+
`sandbox/test.scala` as follows:
99+
100+
- `ant && build/quick/bin/scalac -d sandbox sandbox/test.scala && build/quick/bin/scala -cp sandbox Test`
101+
102+
We typically alias `build/quick/bin/scalac -d sandbox` to `qsc` and `build/quick/bin/scala -cp sandbox` to `qs` in our shell.
103+
104+
`ant test-opt` tests that your code is working and fit to be committed:
105+
106+
- Runs the test suite and bootstrapping test on quick.
107+
- You can run the suite only (skipping strap) with `ant test.suite`.
108+
109+
`ant docs` generates the HTML documentation for the library from the sources using the scaladoc tool in quick.
110+
Note: on most machines this requires more heap than is allocated by default. You can adjust the parameters with `ANT_OPTS`. Example command line:
111+
112+
```sh
113+
ANT_OPTS="-Xms512M -Xmx2048M -Xss1M -XX:MaxPermSize=128M" ant docs
47114
```

build-ant-macros.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -492,9 +492,9 @@
492492
<manifest>
493493
<attribute name="Manifest-Version" value="1.0"/>
494494
<attribute name="Bundle-Name" value="${@{project}.description} Sources"/>
495-
<attribute name="Bundle-SymbolicName" value="org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.source"/>
495+
<attribute name="Bundle-SymbolicName" value="org.typelevel.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.source"/>
496496
<attribute name="Bundle-Version" value="${@{project}.version}"/>
497-
<attribute name="Eclipse-SourceBundle" value="org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix};version=&quot;${@{project}.version}&quot;;roots:=&quot;.&quot;"/>
497+
<attribute name="Eclipse-SourceBundle" value="org.typelevel.${@{project}.package}${@{project}.name}${@{project}.namesuffix};version=&quot;${@{project}.version}&quot;;roots:=&quot;.&quot;"/>
498498
</manifest>
499499
</jar>
500500
</then>
@@ -505,7 +505,7 @@
505505
<macrodef name="copy-bundle">
506506
<attribute name="project"/>
507507
<sequential>
508-
<copy tofile="${dist.dir}/${@{project}.targetdir}/${@{project}.name}.jar" file="${build-osgi.dir}/org.scala-lang.${@{project}.package}${@{project}.name}.jar" overwrite="true"/>
508+
<copy tofile="${dist.dir}/${@{project}.targetdir}/${@{project}.name}.jar" file="${build-osgi.dir}/org.typelevel.${@{project}.package}${@{project}.name}.jar" overwrite="true"/>
509509
<copy tofile="${dist.dir}/src/${@{project}.name}-src.jar" file="${@{project}.srcjar}" overwrite="true"/>
510510
</sequential>
511511
</macrodef>
@@ -516,7 +516,7 @@
516516
<local name="artifact-base"/>
517517
<property name="artifact-base" value="${dist.maven}/${@{project}.dir}${@{project}.name}/${@{project}.name}"/>
518518
<mkdir dir="${dist.maven}/${@{project}.dir}${@{project}.name}"/>
519-
<copy tofile="${artifact-base}.jar" file="${build-osgi.dir}/org.scala-lang.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.jar" overwrite="true"/>
519+
<copy tofile="${artifact-base}.jar" file="${build-osgi.dir}/org.typelevel.${@{project}.package}${@{project}.name}${@{project}.namesuffix}.jar" overwrite="true"/>
520520
<copy tofile="${artifact-base}-src.jar" file="${build-osgi.dir}/${@{project}.name}-src.jar" overwrite="true"/>
521521
<copy tofile="${artifact-base}-pom.xml" file="${src.dir}/build/maven/${@{project}.dir}/${@{project}.name}-pom.xml" overwrite="true"/>
522522
<if>

build.sbt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ val credentialsSetting = credentials += {
6767
}
6868
}
6969

70-
val bootstrapScalaVersion = "2.11.5"
70+
val bootstrapScalaVersion = versionProps("starr.version")
7171

7272
def withoutScalaLang(moduleId: ModuleID): ModuleID = moduleId exclude("org.scala-lang", "*")
7373

@@ -81,7 +81,7 @@ val junitIntefaceDep = "com.novocode" % "junit-interface" % "0.11" % "test"
8181
val asmDep = "org.scala-lang.modules" % "scala-asm" % versionProps("scala-asm.version")
8282
val jlineDep = "jline" % "jline" % versionProps("jline.version")
8383
val antDep = "org.apache.ant" % "ant" % "1.9.4"
84-
val scalacheckDep = withoutScalaLang("org.scalacheck" %% "scalacheck" % "1.11.4")
84+
val scalacheckDep = withoutScalaLang("org.scalacheck" %% "scalacheck" % versionNumber("scalacheck") % "it")
8585

8686
lazy val commonSettings = clearSourceAndResourceDirectories ++ Seq[Setting[_]](
8787
organization := "org.typelevel",

build.xml

100755100644
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,11 @@ TODO:
507507
</condition>
508508

509509
<fail if="has.unsupported.jdk" message="JDK ${ant.java.version} is not supported by this build!"/>
510+
<fail message="Ant 1.9+ required">
511+
<condition>
512+
<not><antversion atleast="1.9" /></not>
513+
</condition>
514+
</fail>
510515

511516
<!-- Allow this to be overridden simply -->
512517
<property name="sbt.latest.version" value="0.12.4"/>

docs/TODO

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353

5454
The process is about the same for symbols in PolyTypes. The main
5555
difference is that type parameters may be referenced and thus we
56-
need something like De Bruijn indicies to represent these
56+
need something like De Bruijn indices to represent these
5757
references.
5858

5959

project/build.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
sbt.version=0.13.8
1+
sbt.version=0.13.9

scripts/jobs/integrate/bootstrap

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
# - Set <MODULE>_VER to override the default, e.g. XML_VER="1.0.4".
3434
# - The git revision is set to <MODULE>_REF="v$<MODULE>_VER". Make sure the tag exists (you can't override <MODULE>_REF).
3535
#
36-
# - Otherwise (moduleVersioning has some other value): in this mode we use nightly version nubmers for modules.
36+
# - Otherwise (moduleVersioning has some other value): in this mode we use nightly version numbers for modules.
3737
# - By default the script sets all <MODULE>_REF to "HEAD", override to build a specific revision.
3838
# - The <MODULE>_VER is set to a nightly version, for example "1.0.3-7-g14888a2-nightly" (you can't override <MODULE>_VER)
3939

@@ -348,7 +348,7 @@ scalaVerToBinary() {
348348
# - the suffix starts with "-bin": 2.12.0-bin-M1
349349
# - the patch version is > 0 : 2.12.1-M1, 1.12.3-RC2, 2.12.1-sha-nightly, 2.12.2-SNAPSHOT
350350
#
351-
# Othwersise, the binary version is the full version: 2.12.0-M1, 2.12.0-RC2, 2.12.0-sha-nightly, 2.12.0-SNAPSHOT
351+
# Otherwise, the binary version is the full version: 2.12.0-M1, 2.12.0-RC2, 2.12.0-sha-nightly, 2.12.0-SNAPSHOT
352352
#
353353
# Adapted from sbt: https://github.com/sbt/sbt/blob/0.13.8/util/cross/src/main/input_sources/CrossVersionUtil.scala#L39
354354
#
@@ -564,7 +564,7 @@ bootstrap() {
564564

565565
echo "### Bootstrapping Scala using locker"
566566

567-
# # TODO: close all open staging repos so that we can be reaonably sure the only open one we see after publishing below is ours
567+
# # TODO: close all open staging repos so that we can be reasonably sure the only open one we see after publishing below is ours
568568
# # the ant call will create a new one
569569
#
570570
# Rebuild Scala with these modules so that all binary versions are consistent.

spec/01-lexical-syntax.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -443,7 +443,7 @@ multiLineChars ::= {[‘"’] [‘"’] charNoDoubleQuote} {‘"’}
443443
444444
A multi-line string literal is a sequence of characters enclosed in
445445
triple quotes `""" ... """`. The sequence of characters is
446-
arbitrary, except that it may contain three or more consuctive quote characters
446+
arbitrary, except that it may contain three or more consecutive quote characters
447447
only at the very end. Characters
448448
must not necessarily be printable; newlines or other
449449
control characters are also permitted. Unicode escapes work as everywhere else, but none

spec/05-classes-and-objects.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ class Outer {
631631
```
632632

633633
Here, accesses to the method `f` can appear anywhere within
634-
`OuterClass`, but not outside it. Accesses to method
634+
`Outer`, but not outside it. Accesses to method
635635
`g` can appear anywhere within the package
636636
`outerpkg.innerpkg`, as would be the case for
637637
package-private methods in Java. Finally, accesses to method

spec/06-expressions.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1736,7 +1736,7 @@ so `scala.Any` is the type inferred for `a`.
17361736
_Eta-expansion_ converts an expression of method type to an
17371737
equivalent expression of function type. It proceeds in two steps.
17381738

1739-
First, one identifes the maximal sub-expressions of $e$; let's
1739+
First, one identifies the maximal sub-expressions of $e$; let's
17401740
say these are $e_1 , \ldots , e_m$. For each of these, one creates a
17411741
fresh name $x_i$. Let $e'$ be the expression resulting from
17421742
replacing every maximal subexpression $e_i$ in $e$ by the

spec/07-implicits.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ The _parts_ of a type $T$ are:
8484
- if $T$ is an abstract type, the parts of its upper bound;
8585
- if $T$ denotes an implicit conversion to a type with a method with argument types $T_1 , \ldots , T_n$ and result type $U$,
8686
the union of the parts of $T_1 , \ldots , T_n$ and $U$;
87-
- the parts of quantified (existential or univeral) and annotated types are defined as the parts of the underlying types (e.g., the parts of `T forSome { ... }` are the parts of `T`);
87+
- the parts of quantified (existential or universal) and annotated types are defined as the parts of the underlying types (e.g., the parts of `T forSome { ... }` are the parts of `T`);
8888
- in all other cases, just $T$ itself.
8989

9090
Note that packages are internally represented as classes with companion modules to hold the package members.

spec/12-the-scala-standard-library.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Any numeric value type $T$ supports the following methods.
171171
evaluated by converting the receiver and its argument to their
172172
operation type and performing the given arithmetic operation of that
173173
type.
174-
* Parameterless arithmethic methods identity (`+`) and negation
174+
* Parameterless arithmetic methods identity (`+`) and negation
175175
(`-`), with result type $T$. The first of these returns the
176176
receiver unchanged, whereas the second returns its negation.
177177
* Conversion methods `toByte`, `toShort`, `toChar`,
@@ -194,7 +194,7 @@ Integer numeric value types support in addition the following operations:
194194
operation of that type.
195195

196196
* A parameterless bit-negation method (`~`). Its result type is
197-
the reciver type $T$ or `Int`, whichever is larger.
197+
the receiver type $T$ or `Int`, whichever is larger.
198198
The operation is evaluated by converting the receiver to the result
199199
type and negating every bit in its value.
200200
* Bit-shift methods left-shift (`<<`), arithmetic right-shift
@@ -745,7 +745,7 @@ object Predef {
745745
def readf2(format: String) = Console.readf2(format)
746746
def readf3(format: String) = Console.readf3(format)
747747

748-
// Implict conversions ------------------------------------------------
748+
// Implicit conversions ------------------------------------------------
749749

750750
...
751751
}

spec/15-changelog.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ formal parameter types. Added section on
3131
[numeric widening](06-expressions.html#numeric-widening) to support
3232
weak conformance.
3333

34-
Tightened rules to avoid accidential [overrides](05-classes-and-objects.html#overriding).
34+
Tightened rules to avoid accidental [overrides](05-classes-and-objects.html#overriding).
3535

3636
Removed class literals.
3737

@@ -53,7 +53,7 @@ has been brought in line with. From now on `+=`, has the same precedence as `=`.
5353

5454
#### Wildcards as function parameters
5555

56-
A formal parameter to an anonymous fucntion may now be a
56+
A formal parameter to an anonymous function may now be a
5757
[wildcard represented by an underscore](06-expressions.html#placeholder-syntax-for-anonymous-functions).
5858

5959
> _ => 7 // The function that ignores its argument

src/actors/scala/actors/Future.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ package scala.actors
1212
import scala.actors.scheduler.DaemonScheduler
1313
import scala.concurrent.SyncVar
1414

15-
/** A function of arity 0, returing a value of type `T` that,
15+
/** A function of arity 0, returning a value of type `T` that,
1616
* when applied, blocks the current actor (`Actor.self`)
1717
* until the future's value is available.
1818
*

src/build/bnd/scala-actors.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Actors
2-
Bundle-SymbolicName: org.scala-lang.scala-actors
2+
Bundle-SymbolicName: org.typelevel.scala-actors
33
ver: @VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-compiler-doc.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Documentation Generator
2-
Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-doc_@SCALA_BINARY_VERSION@
2+
Bundle-SymbolicName: org.typelevel.modules.scala-compiler-doc_@SCALA_BINARY_VERSION@
33
ver: @SCALA_COMPILER_DOC_VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-compiler-interactive.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Interactive Compiler
2-
Bundle-SymbolicName: org.scala-lang.modules.scala-compiler-interactive_@SCALA_BINARY_VERSION@
2+
Bundle-SymbolicName: org.typelevel.modules.scala-compiler-interactive_@SCALA_BINARY_VERSION@
33
ver: @SCALA_COMPILER_INTERACTIVE_VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-compiler.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Compiler
2-
Bundle-SymbolicName: org.scala-lang.scala-compiler
2+
Bundle-SymbolicName: org.typelevel.scala-compiler
33
ver: @VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-continuations-library.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Delimited Continuations Library
2-
Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-library
2+
Bundle-SymbolicName: org.typelevel.plugins.scala-continuations-library
33
ver: @CONTINUATIONS_LIBRARY_VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-continuations-plugin.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Delimited Continuations Compiler Plugin
2-
Bundle-SymbolicName: org.scala-lang.plugins.scala-continuations-plugin
2+
Bundle-SymbolicName: org.typelevel.plugins.scala-continuations-plugin
33
ver: @CONTINUATIONS_PLUGIN_VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-library.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Standard Library
2-
Bundle-SymbolicName: org.scala-lang.scala-library
2+
Bundle-SymbolicName: org.typelevel.scala-library
33
ver: @VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-reflect.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Reflect
2-
Bundle-SymbolicName: org.scala-lang.scala-reflect
2+
Bundle-SymbolicName: org.typelevel.scala-reflect
33
ver: @VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/bnd/scala-typelevel.bnd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Bundle-Name: Scala Typelevel Library
2-
Bundle-SymbolicName: org.scala-lang.scala-typelevel
2+
Bundle-SymbolicName: org.typelevel.scala-typelevel
33
ver: @VERSION@
44
Bundle-Version: ${ver}
55
Export-Package: *;version=${ver}

src/build/maven/scala-actors-pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
33
<modelVersion>4.0.0</modelVersion>
4-
<groupId>org.scala-lang</groupId>
4+
<groupId>org.typelevel</groupId>
55
<artifactId>scala-actors</artifactId>
66
<packaging>jar</packaging>
77
<version>@VERSION@</version>
@@ -33,7 +33,7 @@
3333
</properties>
3434
<dependencies>
3535
<dependency>
36-
<groupId>org.scala-lang</groupId>
36+
<groupId>org.typelevel</groupId>
3737
<artifactId>scala-library</artifactId>
3838
<version>@VERSION@</version>
3939
</dependency>

src/build/maven/scala-compiler-doc-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</issueManagement>
3131
<dependencies>
3232
<dependency>
33-
<groupId>org.scala-lang</groupId>
33+
<groupId>org.typelevel</groupId>
3434
<artifactId>scala-compiler</artifactId>
3535
<version>@VERSION@</version>
3636
</dependency>

src/build/maven/scala-compiler-interactive-pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</issueManagement>
3131
<dependencies>
3232
<dependency>
33-
<groupId>org.scala-lang</groupId>
33+
<groupId>org.typelevel</groupId>
3434
<artifactId>scala-compiler</artifactId>
3535
<version>@VERSION@</version>
3636
</dependency>

0 commit comments

Comments
 (0)