From d98074e358e99c1edf206f35d8c89382995ae259 Mon Sep 17 00:00:00 2001 From: xuwei-k <6b656e6a69@gmail.com> Date: Sun, 3 Jul 2022 12:54:56 +0900 Subject: [PATCH] enable project/source-plugins test --- sbt-app/src/sbt-test/project/source-plugins/build.sbt | 2 +- .../src/sbt-test/project/source-plugins/project/plugin.sbt | 4 ++-- .../sbt-test/project/source-plugins/project/plugins.sbt | 7 ------- .../src/sbt-test/project/source-plugins/{pending => test} | 0 4 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 sbt-app/src/sbt-test/project/source-plugins/project/plugins.sbt rename sbt-app/src/sbt-test/project/source-plugins/{pending => test} (100%) diff --git a/sbt-app/src/sbt-test/project/source-plugins/build.sbt b/sbt-app/src/sbt-test/project/source-plugins/build.sbt index 0b5906837..c9d463090 100644 --- a/sbt-app/src/sbt-test/project/source-plugins/build.sbt +++ b/sbt-app/src/sbt-test/project/source-plugins/build.sbt @@ -2,6 +2,6 @@ name := "source-plugins" organization := "org.example" -proguardSettings +enablePlugins(SbtProguard) useJGit diff --git a/sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt b/sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt index 381215651..e5a6a1f84 100644 --- a/sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt +++ b/sbt-app/src/sbt-test/project/source-plugins/project/plugin.sbt @@ -1,5 +1,5 @@ -lazy val proguard = uri("git://github.com/sbt/sbt-proguard.git#e7b4732969c137db1b5") -lazy val git = uri("git://github.com/sbt/sbt-git.git#2e7c2503850698d60bb") +lazy val proguard = RootProject(uri("https://github.com/sbt/sbt-proguard.git#95b27788a5b00ab89e8ae7c05ef5bfe538129280")) +lazy val git = RootProject(uri("https://github.com/sbt/sbt-git.git#a81a110af1c5693cd3fd0204248f5c529a43a112")) lazy val root = (project in file(".")). dependsOn(proguard, git) diff --git a/sbt-app/src/sbt-test/project/source-plugins/project/plugins.sbt b/sbt-app/src/sbt-test/project/source-plugins/project/plugins.sbt deleted file mode 100644 index 6dc6ae42e..000000000 --- a/sbt-app/src/sbt-test/project/source-plugins/project/plugins.sbt +++ /dev/null @@ -1,7 +0,0 @@ -lazy val plugins = (project in file(".")) - .dependsOn(proguard, git) - -// e7b4732969c137db1b5 -// d4974f7362bf55d3f52 -lazy val proguard = uri("git://github.com/sbt/sbt-proguard.git#e7b4732969c137db1b5") -lazy val git = uri("git://github.com/sbt/sbt-git.git#2e7c2503850698d60bb") diff --git a/sbt-app/src/sbt-test/project/source-plugins/pending b/sbt-app/src/sbt-test/project/source-plugins/test similarity index 100% rename from sbt-app/src/sbt-test/project/source-plugins/pending rename to sbt-app/src/sbt-test/project/source-plugins/test