Skip to content

Commit 97fb4e1

Browse files
committed
SBT build, Travis CI config.
1 parent 0c98832 commit 97fb4e1

File tree

103 files changed

+187
-180
lines changed

Some content is hidden

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

103 files changed

+187
-180
lines changed

.gitignore

Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
#
2+
# Are you tempted to edit this file?
3+
#
4+
# First consider if the changes make sense for all,
5+
# or if they are specific to your workflow/system.
6+
# If it is the latter, you can augment this list with
7+
# entries in .git/info/excludes
8+
#
9+
# see also test/files/.gitignore
10+
#
11+
12+
*.jar
13+
*~
14+
15+
build.properties
16+
17+
# target directories for ant build
18+
/build/
19+
/dists/
20+
21+
# other
22+
/out/
23+
/bin/
24+
/sandbox/
25+
26+
# eclipse, intellij
27+
/.classpath
28+
/.project
29+
/src/intellij/*.iml
30+
/src/intellij/*.ipr
31+
/src/intellij/*.iws
32+
/.cache
33+
/.idea
34+
/.settings
35+
36+
# bak files produced by ./cleanup-commit
37+
*.bak
38+
39+
# Standard symbolic link to build/quick/bin
40+
qbin
41+
42+
# Mac specific, but that is common enough a dev platform to warrant inclusion.
43+
.DS_Store
44+
45+
target/

.travis.yml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
language: scala
2+
script:
3+
- sbt ++$TRAVIS_SCALA_VERSION clean update compile test
4+
scala:
5+
- 2.11.0-SNAPSHOT
6+
jdk:
7+
- openjdk6
8+
- openjdk7
9+
notifications:
10+
email:
11+
12+
13+
# if we get weird timeouts, see https://github.com/spray/spray/pull/233
14+
# 'set concurrentRestrictions in Global += Tags.limit(Tags.Test, 1)'

LICENSE.md

Lines changed: 29 additions & 0 deletions

src/swing/doc/README renamed to README.md

Lines changed: 0 additions & 2 deletions

build.sbt

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import VersionKeys._
2+
3+
organization := "org.scala-lang.modules"
4+
5+
name := "scala-swing"
6+
7+
version := "1.0.0-SNAPSHOT"
8+
9+
scalaVersion := "2.11.0-M7"
10+
11+
snapshotScalaBinaryVersion := "2.11.0-M7"

project/keys.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
object VersionKeys {
2+
import sbt.settingKey
3+
4+
val snapshotScalaBinaryVersion = settingKey[String]("The Scala binary version to use when building against Scala SNAPSHOT.")
5+
6+
def deriveBinaryVersion(sv: String, snapshotScalaBinaryVersion: String) = sv match {
7+
case snap_211 if snap_211.startsWith("2.11") &&
8+
snap_211.contains("-SNAPSHOT") => snapshotScalaBinaryVersion
9+
case sv => sbt.CrossVersion.binaryScalaVersion(sv)
10+
}
11+
}

project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-osgi" % "0.6.0")

src/build/bnd/scala-swing.bnd

Lines changed: 0 additions & 5 deletions
This file was deleted.

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

Lines changed: 0 additions & 61 deletions
This file was deleted.

src/intellij/swing.iml.SAMPLE

Lines changed: 0 additions & 24 deletions
This file was deleted.

0 commit comments

Comments
 (0)