Skip to content

Commit be0db42

Browse files
stringbeanstringbean
committed
Switch org to com.github.sbt
Fixes #87
1 parent 85a661d commit be0db42

35 files changed

+50
-50
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ This is an [sbt](http://scala-sbt.org/) plugin for code coverage analysis via [J
99
Install the plugin by adding the following to `project/plugins.sbt`:
1010

1111
```scala
12-
addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % "3.0.0")
12+
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.0")
1313
```
1414

1515
And then execute the plugin with `sbt jacoco`. This will instrument and run the unit tests and output the coverage

‎build.sbt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name := "sbt-jacoco"
2-
organization := "org.scala-sbt"
2+
organization := "com.github.sbt"
33

4-
version := "3.1.0-SNAPSHOT"
4+
version := "3.0.1-SNAPSHOT"
55

66
sbtPlugin := true
77
crossSbtVersions := Seq("0.13.16", "1.0.2")
@@ -25,7 +25,7 @@ scalacOptions ++= Seq(
2525
"-Ywarn-dead-code")
2626

2727
enablePlugins(BuildInfoPlugin)
28-
buildInfoPackage := "org.scalasbt.jacoco.build"
28+
buildInfoPackage := "com.github.sbt.jacoco.build"
2929
buildInfoKeys := Seq[BuildInfoKey](
3030
resourceDirectory in Test,
3131
version,

‎src/main/scala/org/scalasbt/jacoco/BaseJacocoPlugin.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/BaseJacocoPlugin.scala

+4-4
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

1515
import java.io.File
1616

1717
import org.jacoco.core.runtime.{IRuntime, LoggerRuntime, RuntimeData}
18-
import org.scalasbt.jacoco.build.BuildInfo
19-
import org.scalasbt.jacoco.data.{ExecutionDataUtils, InstrumentationUtils}
20-
import org.scalasbt.jacoco.report.ReportUtils
18+
import com.github.sbt.jacoco.build.BuildInfo
19+
import com.github.sbt.jacoco.data.{ExecutionDataUtils, InstrumentationUtils}
20+
import com.github.sbt.jacoco.report.ReportUtils
2121
import sbt.Keys._
2222
import sbt.plugins.JvmPlugin
2323
import sbt.{Def, _}

‎src/main/scala/org/scalasbt/jacoco/JacocoItPlugin.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/JacocoItPlugin.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

15-
import org.scalasbt.jacoco.data.ExecutionDataUtils
16-
import org.scalasbt.jacoco.report.{JacocoReportSettings, ReportUtils}
15+
import com.github.sbt.jacoco.data.ExecutionDataUtils
16+
import com.github.sbt.jacoco.report.{JacocoReportSettings, ReportUtils}
1717
import sbt.Keys._
1818
import sbt.plugins.JvmPlugin
1919
import sbt.{Def, _}

‎src/main/scala/org/scalasbt/jacoco/JacocoKeys.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/JacocoKeys.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

15-
import org.scalasbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings}
15+
import com.github.sbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings}
1616
import sbt._
1717

1818
// scalastyle:off line.size.limit

‎src/main/scala/org/scalasbt/jacoco/JacocoPlugin.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/JacocoPlugin.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

1515
import sbt._
1616

‎src/main/scala/org/scalasbt/jacoco/data/ExecutionDataUtils.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/data/ExecutionDataUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.data
13+
package com.github.sbt.jacoco.data
1414

1515
import java.io.FileOutputStream
1616

‎src/main/scala/org/scalasbt/jacoco/data/InstrumentationUtils.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/data/InstrumentationUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.data
13+
package com.github.sbt.jacoco.data
1414

1515
import java.io.FileInputStream
1616

‎src/main/scala/org/scalasbt/jacoco/filter/AccessorDetector.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/filter/AccessorDetector.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.filter
13+
package com.github.sbt.jacoco.filter
1414

1515
import org.objectweb.asm.Opcodes._
1616
import org.objectweb.asm.tree._

‎src/main/scala/org/scalasbt/jacoco/filter/FilteringClassAnalyzer.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/filter/FilteringClassAnalyzer.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.filter
13+
package com.github.sbt.jacoco.filter
1414

1515
import org.jacoco.core.analysis.{Analyzer, ICoverageVisitor, IMethodCoverage}
1616
import org.jacoco.core.data.ExecutionDataStore

‎src/main/scala/org/scalasbt/jacoco/filter/ScalaForwarderDetector.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/filter/ScalaForwarderDetector.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.filter
13+
package com.github.sbt.jacoco.filter
1414

1515
import org.objectweb.asm.Opcodes._
1616
import org.objectweb.asm.tree.{JumpInsnNode, MethodInsnNode, MethodNode}

‎src/main/scala/org/scalasbt/jacoco/filter/ScalaSyntheticMethod.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/filter/ScalaSyntheticMethod.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.filter
13+
package com.github.sbt.jacoco.filter
1414

1515
object ScalaSyntheticMethod {
1616
def isSyntheticMethod(owner: String, name: String, firstLine: Int, lastLine: Int): Boolean = {

‎src/main/scala/org/scalasbt/jacoco/report/DirectoriesSourceFileLocator.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/DirectoriesSourceFileLocator.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

1515
import java.io.{File, Reader}
1616

‎src/main/scala/org/scalasbt/jacoco/report/JacocoReportFormats.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/JacocoReportFormats.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

15-
import org.scalasbt.jacoco.report.formats.{CSVReportFormat, HTMLReportFormat, ScalaHTMLReportFormat, XMLReportFormat}
15+
import com.github.sbt.jacoco.report.formats.{CSVReportFormat, HTMLReportFormat, ScalaHTMLReportFormat, XMLReportFormat}
1616

1717
object JacocoReportFormats {
1818

‎src/main/scala/org/scalasbt/jacoco/report/JacocoReportSettings.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/JacocoReportSettings.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

15-
import org.scalasbt.jacoco.report.formats.JacocoReportFormat
15+
import com.github.sbt.jacoco.report.formats.JacocoReportFormat
1616

1717
case class JacocoReportSettings(
1818
title: String = "Jacoco Coverage Report",

‎src/main/scala/org/scalasbt/jacoco/report/JacocoSourceSettings.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/JacocoSourceSettings.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,6 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

1515
case class JacocoSourceSettings(tabWidth: Int = 2, fileEncoding: String = "utf-8")

‎src/main/scala/org/scalasbt/jacoco/report/JacocoThresholds.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/JacocoThresholds.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

1515
case class JacocoThresholds(
1616
instruction: Double = 0,

‎src/main/scala/org/scalasbt/jacoco/report/Report.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/Report.scala

+3-3
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,16 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

1515
import java.io.File
1616
import java.text.DecimalFormat
1717

1818
import org.jacoco.core.analysis._
1919
import org.jacoco.core.data._
2020
import org.jacoco.core.tools.ExecFileLoader
21-
import org.scalasbt.jacoco.filter.FilteringAnalyzer
22-
import org.scalasbt.jacoco.report.formats.JacocoReportFormat
21+
import com.github.sbt.jacoco.filter.FilteringAnalyzer
22+
import com.github.sbt.jacoco.report.formats.JacocoReportFormat
2323
import sbt.Keys._
2424

2525
class Report(

‎src/main/scala/org/scalasbt/jacoco/report/ReportUtils.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/ReportUtils.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report
13+
package com.github.sbt.jacoco.report
1414

1515
import sbt.Keys._
1616
import sbt._

‎src/main/scala/org/scalasbt/jacoco/report/formats/CSVReportFormat.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/formats/CSVReportFormat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report.formats
13+
package com.github.sbt.jacoco.report.formats
1414

1515
import java.io.{File, FileOutputStream}
1616

‎src/main/scala/org/scalasbt/jacoco/report/formats/HTMLReportFormat.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/formats/HTMLReportFormat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report.formats
13+
package com.github.sbt.jacoco.report.formats
1414

1515
import java.io.File
1616

‎src/main/scala/org/scalasbt/jacoco/report/formats/JacocoReportFormat.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/formats/JacocoReportFormat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report.formats
13+
package com.github.sbt.jacoco.report.formats
1414

1515
import java.io.File
1616

‎src/main/scala/org/scalasbt/jacoco/report/formats/ScalaHTMLReportFormat.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/formats/ScalaHTMLReportFormat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report.formats
13+
package com.github.sbt.jacoco.report.formats
1414

1515
import java.io.File
1616

‎src/main/scala/org/scalasbt/jacoco/report/formats/ScalaLanguageNames.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/formats/ScalaLanguageNames.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report.formats
13+
package com.github.sbt.jacoco.report.formats
1414

1515
import org.jacoco.report.JavaNames
16-
import org.scalasbt.jacoco.filter.ScalaForwarderDetector
16+
import com.github.sbt.jacoco.filter.ScalaForwarderDetector
1717

1818
import scala.reflect.NameTransformer._
1919

‎src/main/scala/org/scalasbt/jacoco/report/formats/XMLReportFormat.scala renamed to ‎src/main/scala/com/github/sbt/jacoco/report/formats/XMLReportFormat.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco.report.formats
13+
package com.github.sbt.jacoco.report.formats
1414

1515
import java.io.{File, FileOutputStream}
1616

‎src/sbt-test/sbt-jacoco/forked/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/sbt-test/sbt-jacoco/integration-test-no-merge/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/sbt-test/sbt-jacoco/integration-test/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/sbt-test/sbt-jacoco/multi-build/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/sbt-test/sbt-jacoco/report-settings/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/sbt-test/sbt-jacoco/simple/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/sbt-test/sbt-jacoco/source-settings/project/plugins.sbt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
55
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)
66

7-
else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
7+
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
88
}

‎src/test/scala-sbt-0.13/org/scalasbt/jacoco/TestCounters.scala renamed to ‎src/test/scala-sbt-0.13/com/github/sbt/jacoco/TestCounters.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

1515
import java.io.File
1616

1717
import org.jacoco.core.analysis.{IBundleCoverage, ICounter}
1818
import org.mockito.Mockito.{mock, when}
19-
import org.scalasbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
19+
import com.github.sbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
2020
import sbt.Keys.TaskStreams
2121
import sbt.Logger
2222

‎src/test/scala-sbt-1.0/org/scalasbt/jacoco/TestCounters.scala renamed to ‎src/test/scala-sbt-1.0/com/github/sbt/jacoco/TestCounters.scala

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

1515
import java.io.File
1616

1717
import org.jacoco.core.analysis.{IBundleCoverage, ICounter}
1818
import org.mockito.Mockito.{mock, when}
19-
import org.scalasbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
19+
import com.github.sbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
2020
import sbt.Keys.TaskStreams
2121
import sbt.internal.util.ManagedLogger
2222

‎src/test/scala/org/scalasbt/jacoco/ReportSpec.scala renamed to ‎src/test/scala/com/github/sbt/jacoco/ReportSpec.scala

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* http://www.eclipse.org/legal/epl-v10.html
1111
*/
1212

13-
package org.scalasbt.jacoco
13+
package com.github.sbt.jacoco
1414

1515
import org.scalatest.{FlatSpec, Matchers}
1616

0 commit comments

Comments
 (0)