Skip to content

Commit

Permalink
Switch org to com.github.sbt
Browse files Browse the repository at this point in the history
Fixes #87
  • Loading branch information
stringbean committed Sep 25, 2017
1 parent 85a661d commit be0db42
Show file tree
Hide file tree
Showing 35 changed files with 50 additions and 50 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ This is an [sbt](http://scala-sbt.org/) plugin for code coverage analysis via [J
Install the plugin by adding the following to `project/plugins.sbt`:

```scala
addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % "3.0.0")
addSbtPlugin("com.github.sbt" % "sbt-jacoco" % "3.0.0")
```

And then execute the plugin with `sbt jacoco`. This will instrument and run the unit tests and output the coverage
Expand Down
6 changes: 3 additions & 3 deletions build.sbt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
name := "sbt-jacoco"
organization := "org.scala-sbt"
organization := "com.github.sbt"

version := "3.1.0-SNAPSHOT"
version := "3.0.1-SNAPSHOT"

sbtPlugin := true
crossSbtVersions := Seq("0.13.16", "1.0.2")
Expand All @@ -25,7 +25,7 @@ scalacOptions ++= Seq(
"-Ywarn-dead-code")

enablePlugins(BuildInfoPlugin)
buildInfoPackage := "org.scalasbt.jacoco.build"
buildInfoPackage := "com.github.sbt.jacoco.build"
buildInfoKeys := Seq[BuildInfoKey](
resourceDirectory in Test,
version,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import java.io.File

import org.jacoco.core.runtime.{IRuntime, LoggerRuntime, RuntimeData}
import org.scalasbt.jacoco.build.BuildInfo
import org.scalasbt.jacoco.data.{ExecutionDataUtils, InstrumentationUtils}
import org.scalasbt.jacoco.report.ReportUtils
import com.github.sbt.jacoco.build.BuildInfo
import com.github.sbt.jacoco.data.{ExecutionDataUtils, InstrumentationUtils}
import com.github.sbt.jacoco.report.ReportUtils
import sbt.Keys._
import sbt.plugins.JvmPlugin
import sbt.{Def, _}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import org.scalasbt.jacoco.data.ExecutionDataUtils
import org.scalasbt.jacoco.report.{JacocoReportSettings, ReportUtils}
import com.github.sbt.jacoco.data.ExecutionDataUtils
import com.github.sbt.jacoco.report.{JacocoReportSettings, ReportUtils}
import sbt.Keys._
import sbt.plugins.JvmPlugin
import sbt.{Def, _}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import org.scalasbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings}
import com.github.sbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings}
import sbt._

// scalastyle:off line.size.limit
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import sbt._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.data
package com.github.sbt.jacoco.data

import java.io.FileOutputStream

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.data
package com.github.sbt.jacoco.data

import java.io.FileInputStream

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.filter
package com.github.sbt.jacoco.filter

import org.objectweb.asm.Opcodes._
import org.objectweb.asm.tree._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.filter
package com.github.sbt.jacoco.filter

import org.jacoco.core.analysis.{Analyzer, ICoverageVisitor, IMethodCoverage}
import org.jacoco.core.data.ExecutionDataStore
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.filter
package com.github.sbt.jacoco.filter

import org.objectweb.asm.Opcodes._
import org.objectweb.asm.tree.{JumpInsnNode, MethodInsnNode, MethodNode}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.filter
package com.github.sbt.jacoco.filter

object ScalaSyntheticMethod {
def isSyntheticMethod(owner: String, name: String, firstLine: Int, lastLine: Int): Boolean = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

import java.io.{File, Reader}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

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

object JacocoReportFormats {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

import org.scalasbt.jacoco.report.formats.JacocoReportFormat
import com.github.sbt.jacoco.report.formats.JacocoReportFormat

case class JacocoReportSettings(
title: String = "Jacoco Coverage Report",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,6 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

case class JacocoSourceSettings(tabWidth: Int = 2, fileEncoding: String = "utf-8")
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

case class JacocoThresholds(
instruction: Double = 0,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,16 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

import java.io.File
import java.text.DecimalFormat

import org.jacoco.core.analysis._
import org.jacoco.core.data._
import org.jacoco.core.tools.ExecFileLoader
import org.scalasbt.jacoco.filter.FilteringAnalyzer
import org.scalasbt.jacoco.report.formats.JacocoReportFormat
import com.github.sbt.jacoco.filter.FilteringAnalyzer
import com.github.sbt.jacoco.report.formats.JacocoReportFormat
import sbt.Keys._

class Report(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report
package com.github.sbt.jacoco.report

import sbt.Keys._
import sbt._
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report.formats
package com.github.sbt.jacoco.report.formats

import java.io.{File, FileOutputStream}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report.formats
package com.github.sbt.jacoco.report.formats

import java.io.File

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report.formats
package com.github.sbt.jacoco.report.formats

import java.io.File

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report.formats
package com.github.sbt.jacoco.report.formats

import java.io.File

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report.formats
package com.github.sbt.jacoco.report.formats

import org.jacoco.report.JavaNames
import org.scalasbt.jacoco.filter.ScalaForwarderDetector
import com.github.sbt.jacoco.filter.ScalaForwarderDetector

import scala.reflect.NameTransformer._

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco.report.formats
package com.github.sbt.jacoco.report.formats

import java.io.{File, FileOutputStream}

Expand Down
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-jacoco/forked/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-jacoco/multi-build/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
2 changes: 1 addition & 1 deletion src/sbt-test/sbt-jacoco/simple/project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,5 @@
throw new RuntimeException("""|The system property 'plugin.version' is not defined.
|Specify this property using the parameter -Dplugin.version=<version>""".stripMargin)

else addSbtPlugin("org.scala-sbt" % "sbt-jacoco" % pluginVersion)
else addSbtPlugin("com.github.sbt" % "sbt-jacoco" % pluginVersion)
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import java.io.File

import org.jacoco.core.analysis.{IBundleCoverage, ICounter}
import org.mockito.Mockito.{mock, when}
import org.scalasbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
import com.github.sbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
import sbt.Keys.TaskStreams
import sbt.Logger

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import java.io.File

import org.jacoco.core.analysis.{IBundleCoverage, ICounter}
import org.mockito.Mockito.{mock, when}
import org.scalasbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
import com.github.sbt.jacoco.report.{JacocoReportSettings, JacocoSourceSettings, JacocoThresholds, Report}
import sbt.Keys.TaskStreams
import sbt.internal.util.ManagedLogger

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
* http://www.eclipse.org/legal/epl-v10.html
*/

package org.scalasbt.jacoco
package com.github.sbt.jacoco

import org.scalatest.{FlatSpec, Matchers}

Expand Down

0 comments on commit be0db42

Please sign in to comment.