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.

Sign up for GitHub

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

fix #41 test-08-failOnClassesExcludedFromJarStar #43

Closed
wants to merge 4 commits into from
Closed

fix #41 test-08-failOnClassesExcludedFromJarStar #43

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6185f7d
fix #41 test-08-failOnClassesExcludedFromJarStar
ktoso Aug 15, 2017
86f939a
run scripted on travis
ktoso Aug 15, 2017
ee2f2ef
Update .travis.yml
ktoso Feb 13, 2018
8fcf18c
Merge branch 'master' into wip-fix-test-08-failOnClassesExcludedFromJ…
xuwei-k Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
language: scala
sudo: false
script: sbt scripted
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There are also test cases that need to be run, so sbt test is required.

jdk:
- oraclejdk8
7 changes: 4 additions & 3 deletions src/main/scala/com/typesafe/sbt/osgi/Osgi.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ private object Osgi {
def validateAllPackagesDecidedAbout(internal: Seq[String], exported: Seq[String], realPackages: List[String]): Unit =
if (internal.isEmpty && exported.isEmpty && realPackages.nonEmpty) {
throw new RuntimeException(s"Remaining packages are undecided about (private or exported) for OSGi (this is rather dangerous!): ${realPackages}")
} else
} else {
realPackages match {
case Nil => // OK!
case pack :: remainingPackages =>
Expand All @@ -114,9 +114,10 @@ private object Osgi {
s" Exported packages: $exported\n" +
s" Offending package: $pack\n")
}
}

val i = internal.map(_.replaceAll(".*", ""))
val e = exported.map(_.replaceAll(".*", ""))
val i = internal.map(p => if (p.endsWith(".*")) p.dropRight(2) else p)
val e = exported.map(p => if (p.endsWith(".*")) p.dropRight(2) else p)
validateAllPackagesDecidedAbout(i, e, allPackages.toList)
}

Expand Down
1 change: 1 addition & 0 deletions src/sbt-test/sbt-osgi/test-08-failOnClassesExcludedFromJarStar/project/build.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
sbt.version=0.13.15