From 89f6b17f534b78f41aa250c3b4997a1cf08cad45 Mon Sep 17 00:00:00 2001 From: Hua Jiang Date: Sun, 17 Nov 2024 11:15:13 +0800 Subject: [PATCH 1/3] update organization name --- README.md | 2 +- build.sbt | 10 ++++------ .../sbt-codeartifact/appends-creds/project/plugins.sbt | 2 +- .../do-not-wait-for-skip/project/plugins.sbt | 2 +- .../sbt-codeartifact/resolver/project/plugins.sbt | 2 +- 5 files changed, 8 insertions(+), 10 deletions(-) diff --git a/README.md b/README.md index b3d9e9b..93d4e09 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,7 @@ An sbt plugin for publishing/consuming packages to/from AWS CodeArtifact. First, you will need a CodeArtifact repository. Then, add the following to your sbt `project/plugins.sbt` file: ```scala -addSbtPlugin("com.iterable" % "sbt-codeartifact" % version) +addSbtPlugin("com.tubitv" % "sbt-codeartifact" % version) ``` ## Usage diff --git a/build.sbt b/build.sbt index 4862109..4920212 100644 --- a/build.sbt +++ b/build.sbt @@ -1,10 +1,8 @@ -ThisBuild / organization := "com.iterable" -ThisBuild / organizationName := "Iterable" -ThisBuild / organizationHomepage := Some(url("https://iterable.com")) +ThisBuild / organization := "com.tubitv" ThisBuild / description := "A plugin for authenticating with AWS CodeArtifact" ThisBuild / licenses := Seq("MIT" -> url("https://opensource.org/licenses/MIT")) -ThisBuild / homepage := Some(url("https://github.com/Iterable/sbt-codeartifact")) +ThisBuild / homepage := Some(url("https://github.com/adRise/sbt-codeartifact")) ThisBuild / developers := List( Developer( @@ -17,8 +15,8 @@ ThisBuild / developers := List( ThisBuild / scmInfo := Some( ScmInfo( - url("https://github.com/Iterable/sbt-codeartifact"), - "scm:git@github.com:Iterable/sbt-codeartifact.git" + url("https://github.com/adRise/sbt-codeartifact"), + "scm:git@github.com:adRise/sbt-codeartifact.git" ) ) lazy val testSettings: Seq[Setting[_]] = Seq( diff --git a/sbt-codeartifact/src/sbt-test/sbt-codeartifact/appends-creds/project/plugins.sbt b/sbt-codeartifact/src/sbt-test/sbt-codeartifact/appends-creds/project/plugins.sbt index e4d69ff..dda2e00 100644 --- a/sbt-codeartifact/src/sbt-test/sbt-codeartifact/appends-creds/project/plugins.sbt +++ b/sbt-codeartifact/src/sbt-test/sbt-codeartifact/appends-creds/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.iterable" % "sbt-codeartifact" % System.getProperty("plugin.version")) +addSbtPlugin("com.tubitv" % "sbt-codeartifact" % System.getProperty("plugin.version")) diff --git a/sbt-codeartifact/src/sbt-test/sbt-codeartifact/do-not-wait-for-skip/project/plugins.sbt b/sbt-codeartifact/src/sbt-test/sbt-codeartifact/do-not-wait-for-skip/project/plugins.sbt index e4d69ff..dda2e00 100644 --- a/sbt-codeartifact/src/sbt-test/sbt-codeartifact/do-not-wait-for-skip/project/plugins.sbt +++ b/sbt-codeartifact/src/sbt-test/sbt-codeartifact/do-not-wait-for-skip/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.iterable" % "sbt-codeartifact" % System.getProperty("plugin.version")) +addSbtPlugin("com.tubitv" % "sbt-codeartifact" % System.getProperty("plugin.version")) diff --git a/sbt-codeartifact/src/sbt-test/sbt-codeartifact/resolver/project/plugins.sbt b/sbt-codeartifact/src/sbt-test/sbt-codeartifact/resolver/project/plugins.sbt index e4d69ff..dda2e00 100644 --- a/sbt-codeartifact/src/sbt-test/sbt-codeartifact/resolver/project/plugins.sbt +++ b/sbt-codeartifact/src/sbt-test/sbt-codeartifact/resolver/project/plugins.sbt @@ -1 +1 @@ -addSbtPlugin("com.iterable" % "sbt-codeartifact" % System.getProperty("plugin.version")) +addSbtPlugin("com.tubitv" % "sbt-codeartifact" % System.getProperty("plugin.version")) From 32a525e802662ae1f0d88e6f7152695d59e1d402 Mon Sep 17 00:00:00 2001 From: Hua Jiang Date: Tue, 26 Nov 2024 21:56:35 +0800 Subject: [PATCH 2/3] enable debug log --- .github/workflows/release.yml | 2 +- logging.properties | 13 +++++++++++++ project/SetLoggerLevel.scala | 9 +++++++++ 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 logging.properties create mode 100644 project/SetLoggerLevel.scala diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index dfdc125..8916e79 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -16,7 +16,7 @@ jobs: distribution: temurin java-version: 8 cache: sbt - - run: sbt ci-release + - run: sbt -Djava.util.logging.config.file=logging.properties ci-release env: PGP_PASSPHRASE: ${{ secrets.PGP_PASSPHRASE }} PGP_SECRET: ${{ secrets.PGP_SECRET }} diff --git a/logging.properties b/logging.properties new file mode 100644 index 0000000..bd8b317 --- /dev/null +++ b/logging.properties @@ -0,0 +1,13 @@ +handlers= java.util.logging.ConsoleHandler + +.level= INFO + +java.util.logging.FileHandler.pattern = %h/java%u.log +java.util.logging.FileHandler.limit = 50000 +java.util.logging.FileHandler.count = 1 +java.util.logging.FileHandler.maxLocks = 100 +java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter + +java.util.logging.ConsoleHandler.level = INFO +java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter +sun.net.www.protocol.http.HttpURLConnection.level = FINE diff --git a/project/SetLoggerLevel.scala b/project/SetLoggerLevel.scala new file mode 100644 index 0000000..34fd814 --- /dev/null +++ b/project/SetLoggerLevel.scala @@ -0,0 +1,9 @@ +import sun.util.logging.PlatformLogger + +object SetLoggerLevel { + def setHttpURLConnectionLoggerLevelToFine(): Unit = { + PlatformLogger + .getLogger("sun.net.www.protocol.http.HttpURLConnection") + .setLevel(PlatformLogger.Level.FINE) + } +} From b5a29112f1048a4ce86b171eca3a35146ef6b4fd Mon Sep 17 00:00:00 2001 From: Hua Jiang Date: Thu, 28 Nov 2024 16:06:01 +0800 Subject: [PATCH 3/3] projectID should be used to generate the url path for codeartifact --- .../src/main/scala/codeartifact/CodeArtifactPlugin.scala | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sbt-codeartifact/src/main/scala/codeartifact/CodeArtifactPlugin.scala b/sbt-codeartifact/src/main/scala/codeartifact/CodeArtifactPlugin.scala index 16a7968..0375ecf 100644 --- a/sbt-codeartifact/src/main/scala/codeartifact/CodeArtifactPlugin.scala +++ b/sbt-codeartifact/src/main/scala/codeartifact/CodeArtifactPlugin.scala @@ -34,9 +34,9 @@ object CodeArtifactPlugin extends AutoPlugin { codeArtifactConnectTimeout := CodeArtifact.Defaults.CONNECT_TIMEOUT, codeArtifactReadTimeout := CodeArtifact.Defaults.READ_TIMEOUT, codeArtifactPackage := CodeArtifactPackage( - organization = organization.value, - name = name.value, - version = version.value, + organization = projectID.value.organization, + name = projectID.value.name, + version = projectID.value.revision, scalaVersion = scalaVersion.value, sbtBinaryVersion = if (sbtPlugin.value) Some(sbtBinaryVersion.value) else None, // See: https://www.scala-sbt.org/1.x/docs/Cross-Build.html#Scala-version+specific+source+directory