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

Apache License Version 2.0 #7306

Merged
merged 1 commit into from Oct 5, 2018

Conversation

@eed3si9n
Copy link
Member

eed3si9n commented Oct 2, 2018

Fixes scala/bug#9026

@scala-jenkins scala-jenkins added this to the 2.13.0-RC1 milestone Oct 2, 2018

build.sbt Outdated
| ________ ___ / / ___ Scala
| / __/ __// _ | / / / _ | $epflCopyright
| __\\ \\/ /__/ __ |/ /__/ __ | $lightbendCopyright
| /____/\\___/_/ |_/____/_/ | | http://scala-lang.org/

This comment has been minimized.

@sjrd

sjrd Oct 2, 2018

Member

https ?

build.sbt Outdated
Global / baseVersion := "2.13.0"
Global / baseVersionSuffix := "SNAPSHOT"
ThisBuild / organization := "org.scala-lang"
ThisBuild / homepage := Some(url("http://www.scala-lang.org"))

This comment has been minimized.

@sjrd

sjrd Oct 2, 2018

Member

https ?

@eed3si9n eed3si9n force-pushed the eed3si9n:wip/apache branch from 40f868b to 75f41c2 Oct 2, 2018

@SethTisue

This comment has been minimized.

Copy link
Member

SethTisue commented Oct 2, 2018

@SethTisue

This comment has been minimized.

Copy link
Member

SethTisue commented Oct 2, 2018

if we include the copyright year in every source file, then we'll have to update it every year, and then the history of every source file will become cluttered with those annual commits. would omitting the per-source-file years, and just putting the years in a small number of centralized places, be okay...?

@eed3si9n

This comment has been minimized.

Copy link
Member Author

eed3si9n commented Oct 2, 2018

@SethTisue As per Apache is concerned that's fine, so let's do that.

@eed3si9n eed3si9n force-pushed the eed3si9n:wip/apache branch 4 times, most recently from e1289ef to 6f0cd6c Oct 2, 2018

@SethTisue SethTisue requested a review from adriaanm Oct 3, 2018

@jvican

jvican approved these changes Oct 3, 2018

Copy link
Member

jvican left a comment

Yuhu! Really excited to see this happening.

Show resolved Hide resolved test/files/pos/spec-Function1.scala Outdated
Show resolved Hide resolved test/instrumented/boxes.patch
Show resolved Hide resolved build.sbt
build.sbt Outdated
ThisBuild / organization := "org.scala-lang"
ThisBuild / homepage := Some(url("https://www.scala-lang.org"))
ThisBuild / startYear := Some(2002)
ThisBuild / licenses += (("Apache-2.0", url("https://github.com/scala/scala/blob/2.13.x/LICENSE")))

This comment has been minimized.

@dwijnand

dwijnand Oct 3, 2018

Member

Is it worth maintaining this URL every major version, or using, perhaps, https://www.apache.org/licenses/LICENSE-2.0 ?

This comment has been minimized.

@adriaanm

adriaanm Oct 3, 2018

Member

+1 on using the apache url.

This comment has been minimized.

@adriaanm

adriaanm Oct 3, 2018

Member

We should also update our pom generation, and link to apache.org instead of scala-lang.org

@adriaanm

This comment has been minimized.

Copy link
Member

adriaanm commented Oct 3, 2018

build.sbt Outdated
| / __/ __// _ | / / / _ | (c) EPFL
| __\\ \\/ /__/ __ |/ /__/ __ | (c) Lightbend, Inc.
| /____/\\___/_/ |_/____/_/ | | ${(ThisBuild/homepage).value.get}
| |/ Licensed under Apache License 2.0

This comment has been minimized.

@lrytz

lrytz Oct 3, 2018

Member

I wouldn't mind having this fine piece of art printed, framed, put on a shelf and move on to a future of lighter headers in scala/scala source files 😊

This comment has been minimized.

@adriaanm

adriaanm Oct 3, 2018

Member

It sure is pretty, but I'm also in favor of a more minimal approach.

This comment has been minimized.

@SethTisue

SethTisue Oct 3, 2018

Member

haha I'm so used to it I didn't even occur to me to suggest a change

agree, it isn't worth the vertical real estate, and now's our chance.

This comment has been minimized.

@eed3si9n

eed3si9n Oct 3, 2018

Author Member

It only looks ugly here because I needed to escape backslash to \\ even though I am using tripplequote """. Is that an expected behavior with s"""?

This comment has been minimized.

@eed3si9n

eed3si9n Oct 3, 2018

Author Member

May I interest you in Bloody theme during the month of October?

  ██████  ▄████▄   ▄▄▄       ██▓    ▄▄▄      
▒██    ▒ ▒██▀ ▀█  ▒████▄    ▓██▒   ▒████▄    
░ ▓██▄   ▒▓█    ▄ ▒██  ▀█▄  ▒██░   ▒██  ▀█▄  
  ▒   ██▒▒▓▓▄ ▄██▒░██▄▄▄▄██ ▒██░   ░██▄▄▄▄██ 
▒██████▒▒▒ ▓███▀ ░ ▓█   ▓██▒░██████▒▓█   ▓██▒
▒ ▒▓▒ ▒ ░░ ░▒ ▒  ░ ▒▒   ▓▒█░░ ▒░▓  ░▒▒   ▓▒█░
░ ░▒  ░ ░  ░  ▒     ▒   ▒▒ ░░ ░ ▒  ░ ▒   ▒▒ ░
░  ░  ░  ░          ░   ▒     ░ ░    ░   ▒   
      ░  ░ ░            ░  ░    ░  ░     ░  ░
         ░                                   

This comment has been minimized.

@adriaanm

adriaanm Oct 3, 2018

Member

Careful not to trigger font bikeshedding 😱

This comment has been minimized.

@eed3si9n

eed3si9n Oct 3, 2018

Author Member

I took the liberty to replace "NSC -- new Scala compiler" with just "Scala". Are you folks cool with that?

This comment has been minimized.

@adriaanm

adriaanm Oct 3, 2018

Member

Yeah, better not to be reminded it's actually the new old scala compiler :-)

@eed3si9n eed3si9n force-pushed the eed3si9n:wip/apache branch from 6f0cd6c to c6e7e82 Oct 3, 2018

** __\ \/ /__/ __ |/ /__/ __ | http://scala-lang.org/ **
** /____/\___/_/ |_/____/_/ | | **
** |/ **
\* */

This comment has been minimized.

@eed3si9n

eed3si9n Oct 3, 2018

Author Member

RIP ASCII art.

This comment has been minimized.

@SethTisue

SethTisue Oct 3, 2018

Member

at the risk of bikeshedding (but, we only want to do this once):

the main reason I was interested in seeing the ASCII art die was to save vertical screen real estate, it wasn't actually about the ASCII art itself.

wdyt about condensing

/*
 * Scala
 * (c) EPFL
 * (c) Lightbend, Inc.
 * https://www.scala-lang.org
 * Licensed under Apache License 2.0
 *
 * See the NOTICE file distributed with this work for additional information
 * regarding copyright ownership.
 */

to

/* Scala. (c) EPFL, (c) Lightbend, Inc. Apache License 2.0.
 * See NOTICE file for full license and copyright info. */

This comment has been minimized.

@dwijnand

dwijnand Oct 3, 2018

Member

Btw, the "standard license header" is quite long: https://spdx.org/licenses/Apache-2.0.html#licenseHeader

This comment has been minimized.

@eed3si9n

eed3si9n Oct 4, 2018

Author Member

I am personally meh about saving some vertical lines on top of the file, but I don't work with this code base every day. /* at the top and bottom is generated by sbt-header, so it's out my control. If you could tally up the Scala team's opinion on exact header on top, I can make another change. There's adjustment of patch file I have to do etc, so it's not super easy.

This comment has been minimized.

@NthPortal

NthPortal Oct 4, 2018

Contributor

Personally, I don't mind the vertical lines at the top of the file. It's not that long, and honestly feels... like it makes the copyright/license notice less ugly and annoying? idk. that's just how I personally feel.

Also I feel like the ASCII art makes it easy to tell at a glace that it's the copyright header, whereas with the suggested 2 line version, it's less obvious and (without reading) might be a comment about the internal structure of the file or something.

This comment has been minimized.

@lrytz

lrytz Oct 5, 2018

Member

Thank you! Let's merge this before we run into merge conflicts @adriaanm

This comment has been minimized.

@eed3si9n

eed3si9n Oct 5, 2018

Author Member

To counter the encroaching Swiss minimalist contingency I am sending a PR to add ASCII art to sbt/sbt's startup - sbt/sbt@0d78816

This comment has been minimized.

@som-snytt

som-snytt Oct 6, 2018

Contributor

What a shock to update! It's still broken on 2.13, but now I recognize the historical importance of:

$ scala -Dscala.banner=welcome

     ________ ___   / /  ___  
    / __/ __// _ | / /  / _ | 
  __\ \/ /__/ __ |/ /__/ __ | 
 /____/\___/_/ |_/____/_/ | | 
                          |/  version 2.12.6

scala> 

This comment has been minimized.

@som-snytt

som-snytt Oct 6, 2018

Contributor

Whew...

$ scalam -Dscala.repl.welcome=banner

     ________ ___   / /  ___
    / __/ __// _ | / /  / _ |
  __\ \/ /__/ __ |/ /__/ __ |
 /____/\___/_/ |_/____/_/ | |
                          |/  version 2.13.0-M5

scala> 

That should go in the release notes...

@eed3si9n eed3si9n force-pushed the eed3si9n:wip/apache branch from c6e7e82 to 2d9e6ac Oct 5, 2018

@@ -1,4 +1,4 @@
Scala is licensed under the [BSD 3-Clause License](http://opensource.org/licenses/BSD-3-Clause).
Scala is licensed under the [Apache License Version 2.0](https://www.apache.org/licenses/LICENSE-2.0).

## Scala License

This comment has been minimized.

@dwijnand

dwijnand Oct 5, 2018

Member

Should this be dropped, or reworded? It's not longer the "Scala License", based on BSD 3-Clause, it's now the Apache Licence, Version 2.0, as is.

@dwijnand
Copy link
Member

dwijnand left a comment

This is great, and I echo Lukas' thought: let's merge this before it conflicts.

@adriaanm

This comment has been minimized.

Copy link
Member

adriaanm commented Oct 5, 2018

🍰 thanks for getting this done, @eed3si9n!

@adriaanm adriaanm merged commit ba97010 into scala:2.13.x Oct 5, 2018

3 checks passed

cla @eed3si9n signed the Scala CLA. Thanks!
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
validate-main [5021] SUCCESS. Took 30 min.
Details

@eed3si9n eed3si9n deleted the eed3si9n:wip/apache branch Oct 5, 2018

@som-snytt

This comment has been minimized.

Copy link
Contributor

som-snytt commented Oct 25, 2018

That was quite a-patch-y.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.