@@ -834,7 +834,7 @@ trait Cli extends SbtModule with ProtoBuildModule with CliLaunchers
834
834
workingDir = os.pwd
835
835
)
836
836
val cp = res.out.trim()
837
- cp.split(File .pathSeparator).toSeq.map(p => mill. PathRef (os.Path (p)))
837
+ cp.split(File .pathSeparator).toSeq.map(p => PathRef (os.Path (p)))
838
838
}
839
839
840
840
def localRepoJar = `local-repo`.localRepoJar()
@@ -869,20 +869,6 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
869
869
super .scalacOptions() ++ Seq (" -Xasync" , " -deprecation" )
870
870
}
871
871
872
- def modulesPath = T {
873
- val name = mainArtifactName().stripPrefix(prefix)
874
- val baseIntegrationPath = os.Path (millSourcePath.toString.stripSuffix(name))
875
- baseIntegrationPath.toString.stripSuffix(baseIntegrationPath.baseName)
876
- }
877
- def sources = T .sources {
878
- val mainPath = PathRef (os.Path (modulesPath()) / " integration" / " src" / " main" / " scala" )
879
- super .sources() ++ Seq (mainPath)
880
- }
881
- def resources = T .sources {
882
- val mainPath = PathRef (os.Path (modulesPath()) / " integration" / " src" / " main" / " resources" )
883
- super .resources() ++ Seq (mainPath)
884
- }
885
-
886
872
def ivyDeps = super .ivyDeps() ++ Agg (
887
873
Deps .osLib
888
874
)
@@ -909,25 +895,6 @@ trait CliIntegration extends SbtModule with ScalaCliPublishModule with HasTests
909
895
" SCALA_CLI_PRINT_STACK_TRACES" -> " 1" ,
910
896
" SCALA_CLI_CONFIG" -> (tmpDirBase().path / " config" / " config.json" ).toString
911
897
)
912
- private def updateRef (name : String , ref : PathRef ): PathRef = {
913
- val rawPath = ref.path.toString.replace(
914
- File .separator + name + File .separator,
915
- File .separator
916
- )
917
- PathRef (os.Path (rawPath))
918
- }
919
- def sources = T .sources {
920
- val name = mainArtifactName().stripPrefix(prefix)
921
- super .sources().flatMap { ref =>
922
- Seq (updateRef(name, ref), ref)
923
- }
924
- }
925
- def resources = T .sources {
926
- val name = mainArtifactName().stripPrefix(prefix)
927
- super .resources().flatMap { ref =>
928
- Seq (updateRef(name, ref), ref)
929
- }
930
- }
931
898
932
899
def constantsFile = T .persistent {
933
900
val dir = T .dest / " constants"
0 commit comments