Skip to content

Commit

Permalink
chore: drop bundle, see gatling/gatling#4512
Browse files Browse the repository at this point in the history
  • Loading branch information
slandelle committed Feb 20, 2024
1 parent 24f8d4c commit 529373b
Show file tree
Hide file tree
Showing 36 changed files with 6 additions and 90 deletions.
35 changes: 6 additions & 29 deletions build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -2,40 +2,17 @@ import sbt._

import BuildSettings._
import Dependencies._
import Bundle._

Global / githubPath := "gatling/gatling-highcharts"
Global / gatlingDevelopers := Seq(
githubPath := "gatling/gatling-highcharts"
gatlingDevelopers := Seq(
GatlingDeveloper("slandelle@gatling.io", "Stephane Landelle", isGatlingCorp = true),
GatlingDeveloper("gcorre@gatling.io", "Guillaume Corré", isGatlingCorp = true)
)
Global / scalaVersion := "2.13.12"
scalaVersion := "2.13.12"
ThisBuild / sonatypeCredentialHost := "s01.oss.sonatype.org"

// Root project

lazy val root = Project("gatling-highcharts", file("."))
lazy val root = (project in file("."))
.enablePlugins(GatlingOssPlugin)
.aggregate(gatlingChartsHighcharts, gatlingHighchartsBundle)
.settings(basicSettings)
.settings(publish / skip := true)

// Modules

def gatlingHighchartsModule(id: String) =
Project(id, file(id))
.enablePlugins(GatlingOssPlugin)
.settings(basicSettings ++ CodeAnalysis.settings)

lazy val gatlingChartsHighcharts = gatlingHighchartsModule("gatling-charts-highcharts")
.settings(name := "gatling-charts-highcharts")
.settings(basicSettings ++ CodeAnalysis.settings)
.settings(libraryDependencies ++= gatlingChartsHighchartsDeps(version.value))
.settings(exportJars := true)

lazy val gatlingHighchartsBundle = gatlingHighchartsModule("gatling-charts-highcharts-bundle")
.dependsOn(gatlingChartsHighcharts)
.enablePlugins(UniversalPlugin)
.settings(libraryDependencies ++= gatlingHighchartsBundleDeps(version.value, scalaVersion.value))
.settings(bundleSettings: _*)
.settings(packageDoc / publishArtifact := false) // no javadoc
.settings(packageSrc / publishArtifact := false) // no source
.settings(packageBin / publishArtifact := false) // no jar (only the bundle.zip remains)
Empty file.
52 changes: 0 additions & 52 deletions project/Bundle.scala

This file was deleted.

8 changes: 0 additions & 8 deletions project/Dependencies.scala
Original file line number Diff line number Diff line change
@@ -1,19 +1,11 @@
import sbt._

object Dependencies {
private val bundleArtifact = Artifact("gatling-bundle", "zip", "zip", "bundle")

// format: OFF
def app(gatlingVersion: String) = "io.gatling" % "gatling-app" % gatlingVersion
def compiler(gatlingVersion: String) = "io.gatling" % "gatling-compiler" % gatlingVersion
def recorder(gatlingVersion: String) = "io.gatling" % "gatling-recorder" % gatlingVersion
def bundleJar(gatlingVersion: String) = "io.gatling" % "gatling-bundle" % gatlingVersion
def bundle(gatlingVersion: String) = "io.gatling" % "gatling-bundle" % gatlingVersion artifacts bundleArtifact
// format: ON

def gatlingChartsHighchartsDeps(version: String) =
Seq(app _, recorder _).map(_(version))

def gatlingHighchartsBundleDeps(gatlingVersion: String, scalaVersion: String) =
Seq(bundle _, compiler _, bundleJar _).map(_(gatlingVersion))
}
1 change: 0 additions & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
addSbtPlugin("io.gatling" % "gatling-build-plugin" % "6.1.1")
addSbtPlugin("com.github.sbt" % "sbt-native-packager" % "1.9.16")
addSbtPlugin("org.wartremover" % "sbt-wartremover" % "3.1.6")
File renamed without changes.

0 comments on commit 529373b

Please sign in to comment.