From 97e92d663a7acd27643466ec634762599e1d90a7 Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Mon, 16 Jan 2023 16:25:32 +0330 Subject: [PATCH 1/8] aggregate docs project. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 34be32c8..bd61c9da 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ addCommandAlias("fix", "; all compile:scalafix test:scalafix; all scalafmtSbt sc val zioVersion = "2.0.0" lazy val root = - project.in(file(".")).settings(publish / skip := false).aggregate(`zio-ftp`) + project.in(file(".")).settings(publish / skip := false).aggregate(`zio-ftp`, docs) lazy val `zio-ftp` = project .in(file("zio-ftp")) From 2a04fb2ce9c605fff4d35614b27caeba35b536c0 Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Mon, 16 Jan 2023 16:54:56 +0330 Subject: [PATCH 2/8] remove dependsOn. --- build.sbt | 1 - 1 file changed, 1 deletion(-) diff --git a/build.sbt b/build.sbt index bd61c9da..2ba133ba 100644 --- a/build.sbt +++ b/build.sbt @@ -67,5 +67,4 @@ lazy val docs = project ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(`zio-ftp`), docsPublishBranch := "series/2.x" ) - .dependsOn(`zio-ftp`) .enablePlugins(WebsitePlugin) From f4739a8fe6d6fbf76df91c8da820ff43e0e7296d Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Mon, 16 Jan 2023 18:15:04 +0330 Subject: [PATCH 3/8] add zio to docs project. --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 2ba133ba..078a09bf 100644 --- a/build.sbt +++ b/build.sbt @@ -58,6 +58,7 @@ lazy val docs = project moduleName := "zio-ftp-docs", scalacOptions -= "-Yno-imports", scalacOptions -= "-Xfatal-warnings", + libraryDependencies ++= Seq("dev.zio" %% "zio" % zioVersion), test / aggregate := false, scalaVersion := Scala213, crossScalaVersions := Seq(Scala212, Scala213), From 576c315f4a50203cb4aa8af9289e1a709878197d Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Tue, 17 Jan 2023 11:27:55 +0330 Subject: [PATCH 4/8] skip publishing root module. --- build.sbt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.sbt b/build.sbt index 078a09bf..d3bc5621 100644 --- a/build.sbt +++ b/build.sbt @@ -30,7 +30,7 @@ addCommandAlias("fix", "; all compile:scalafix test:scalafix; all scalafmtSbt sc val zioVersion = "2.0.0" lazy val root = - project.in(file(".")).settings(publish / skip := false).aggregate(`zio-ftp`, docs) + project.in(file(".")).settings(publish / skip := true).aggregate(`zio-ftp`, docs) lazy val `zio-ftp` = project .in(file("zio-ftp")) From d07d9580d428a72fbbdcdee56c1f7ae1c8e77392 Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Tue, 17 Jan 2023 11:56:41 +0330 Subject: [PATCH 5/8] depend on zio-ftp. --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index d3bc5621..6d3c30da 100644 --- a/build.sbt +++ b/build.sbt @@ -68,4 +68,5 @@ lazy val docs = project ScalaUnidoc / unidoc / unidocProjectFilter := inProjects(`zio-ftp`), docsPublishBranch := "series/2.x" ) + .dependsOn(`zio-ftp`) .enablePlugins(WebsitePlugin) From 856efdf7d8ea1e578a254573f4e123db49c6cea0 Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Tue, 17 Jan 2023 14:19:13 +0330 Subject: [PATCH 6/8] disable aggregating docs on update task. --- build.sbt | 1 + 1 file changed, 1 insertion(+) diff --git a/build.sbt b/build.sbt index 6d3c30da..f88e671f 100644 --- a/build.sbt +++ b/build.sbt @@ -59,6 +59,7 @@ lazy val docs = project scalacOptions -= "-Yno-imports", scalacOptions -= "-Xfatal-warnings", libraryDependencies ++= Seq("dev.zio" %% "zio" % zioVersion), + update / aggregate := false, test / aggregate := false, scalaVersion := Scala213, crossScalaVersions := Seq(Scala212, Scala213), From e4141d1b6414700bc68ed0c6e81873fb451dccd0 Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Tue, 17 Jan 2023 15:57:39 +0330 Subject: [PATCH 7/8] use specific submodule for testing. --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c866e4bf..e8807d9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -67,7 +67,7 @@ jobs: chmod -R 777 ./zio-ftp/ftp-home/sftp/home/foo/dir1 - name: Test 2.x if: ${{ !startsWith(matrix.scala, '3.') }} - run: ./sbt ++${{ matrix.scala }} test + run: ./sbt ++${{ matrix.scala }} zio-ftp/test # - name: Test 3.x # if: ${{ startsWith(matrix.scala, '3.') }} # run: ./sbt ++${{ matrix.scala }}! testDotty From 6104763db9096ec7f601711b5fd4cd4f9d81a6f6 Mon Sep 17 00:00:00 2001 From: Milad Khajavi Date: Tue, 17 Jan 2023 16:06:03 +0330 Subject: [PATCH 8/8] remove extra settings. --- build.sbt | 2 -- 1 file changed, 2 deletions(-) diff --git a/build.sbt b/build.sbt index f88e671f..a7a87a25 100644 --- a/build.sbt +++ b/build.sbt @@ -59,8 +59,6 @@ lazy val docs = project scalacOptions -= "-Yno-imports", scalacOptions -= "-Xfatal-warnings", libraryDependencies ++= Seq("dev.zio" %% "zio" % zioVersion), - update / aggregate := false, - test / aggregate := false, scalaVersion := Scala213, crossScalaVersions := Seq(Scala212, Scala213), projectName := "ZIO FTP",