Skip to content

Update sbt-scalafix to 0.14.3 #559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion images/app/sbt
2 changes: 1 addition & 1 deletion images/fakemail/mailslurper
Submodule mailslurper updated 48 files
+12 βˆ’12 Dockerfile
+11 βˆ’1 README.md
+1 βˆ’1 bin/create-mysql.sql
+15 βˆ’0 bin/package.sh
+1 βˆ’1 cmd/mailslurper/adminAuthMiddleware.go
+2 βˆ’0 cmd/mailslurper/config.json
+16 βˆ’14 cmd/mailslurper/controllers/AdminController.go
+55 βˆ’1 cmd/mailslurper/controllers/ServiceController.go
+6 βˆ’4 cmd/mailslurper/mailslurper.go
+1 βˆ’1 cmd/mailslurper/serviceAuthMiddleware.go
+1 βˆ’1 cmd/mailslurper/setupAdminListener.go
+2 βˆ’2 cmd/mailslurper/setupConfig.go
+9 βˆ’5 cmd/mailslurper/setupServicesListener.go
+5 βˆ’4 cmd/mailslurper/www/mailslurper/js/app.js
+3 βˆ’2 cmd/mailslurper/www/mailslurper/js/controllers/AdminController.js
+1 βˆ’1 cmd/mailslurper/www/mailslurper/js/controllers/HomeController.js
+3 βˆ’2 cmd/mailslurper/www/mailslurper/js/controllers/LoginController.js
+2 βˆ’1 cmd/mailslurper/www/mailslurper/js/services/AuthService.js
+10 βˆ’7 cmd/mailslurper/www/mailslurper/js/services/SettingsService.js
+2 βˆ’1 cmd/mailslurper/www/mailslurper/js/services/TemplateService.js
+2 βˆ’1 cmd/mailslurper/www/mailslurper/js/widgets/SavedSearchesWidget.js
+22 βˆ’20 cmd/mailslurper/www/mailslurper/layouts/loginLayout.gohtml
+41 βˆ’39 cmd/mailslurper/www/mailslurper/layouts/mainLayout.gohtml
+1 βˆ’1 cmd/mailslurper/www/mailslurper/pages/admin.gohtml
+1 βˆ’1 cmd/mailslurper/www/mailslurper/pages/index.gohtml
+2 βˆ’2 cmd/mailslurper/www/mailslurper/pages/login.gohtml
+1 βˆ’1 cmd/mailslurper/www/mailslurper/pages/manageSavedSearches.gohtml
+1 βˆ’1 cmd/mailslurper/www/mailslurper/templates/helpers/attachmentURL.js
+700 βˆ’310 cmd/mailslurper/www/www.go
+24 βˆ’0 go.mod
+203 βˆ’0 go.sum
+1 βˆ’1 pkg/contexts/AdminUserContext.go
+1 βˆ’1 pkg/mailslurper/ApplyThemeRequest.go
+26 βˆ’2 pkg/mailslurper/Configuration.go
+7 βˆ’13 pkg/mailslurper/DataCommandExecutor.go
+1 βˆ’0 pkg/mailslurper/IStorage.go
+40 βˆ’0 pkg/mailslurper/MSSQLStorage.go
+9 βˆ’6 pkg/mailslurper/MailCommandExecutor.go
+40 βˆ’0 pkg/mailslurper/MySQLStorage.go
+44 βˆ’0 pkg/mailslurper/NoopCommandExecutor.go
+6 βˆ’5 pkg/mailslurper/Page.go
+43 βˆ’0 pkg/mailslurper/ResetCommandExecutor.go
+12 βˆ’1 pkg/mailslurper/SMTPMessagePart.go
+12 βˆ’0 pkg/mailslurper/SMTPWorker.go
+40 βˆ’0 pkg/mailslurper/SQLiteStorage.go
+1 βˆ’3 pkg/mailslurper/ServiceSettings.go
+3 βˆ’0 pkg/mailslurper/SmtpCommands.go
+1 βˆ’1 pkg/ui/TemplateRenderer.go
2 changes: 1 addition & 1 deletion images/web/lua-packages/inspect.lua
2 changes: 1 addition & 1 deletion images/web/lua-packages/lua-resty-redis
Submodule lua-resty-redis updated 20 files
+3 βˆ’0 .luacheckrc
+29 βˆ’13 .travis.yml
+122 βˆ’18 README.markdown
+311 βˆ’23 lib/resty/redis.lua
+57 βˆ’0 t/Test.pm
+10 βˆ’26 t/bugs.t
+17 βˆ’0 t/cert/test.crt
+15 βˆ’0 t/cert/test.key
+4 βˆ’23 t/count.t
+9 βˆ’37 t/hmset.t
+3 βˆ’22 t/mock.t
+82 βˆ’0 t/module.t
+13 βˆ’48 t/pipeline.t
+437 βˆ’67 t/pubsub.t
+321 βˆ’99 t/sanity.t
+343 βˆ’0 t/ssl.t
+5 βˆ’28 t/transaction.t
+7 βˆ’25 t/user-cmds.t
+3 βˆ’20 t/version.t
+19 βˆ’102 valgrind.suppress
2 changes: 1 addition & 1 deletion images/web/modules/lua-nginx-module
Submodule lua-nginx-module updated 273 files
2 changes: 1 addition & 1 deletion images/web/modules/luajit
Submodule luajit updated 227 files
2 changes: 1 addition & 1 deletion images/web/modules/ngx_devel_kit
2 changes: 1 addition & 1 deletion images/web/node_modules
Submodule node_modules updated 284 files
2 changes: 1 addition & 1 deletion images/web/openresty
Submodule openresty updated 2751 files
2 changes: 1 addition & 1 deletion images/web/openresty-pkgs
Submodule openresty-pkgs updated 119 files
2 changes: 1 addition & 1 deletion images/web/ty-media
Submodule ty-media updated 225 files
2 changes: 1 addition & 1 deletion modules/ed-versions
Submodule ed-versions updated 2 files
+5 βˆ’5 docker-compose.yml
+50 βˆ’6 version-tags.log
2 changes: 1 addition & 1 deletion modules/gatsby-starter-blog-ed-comments-0.4.4
Submodule gatsby-starter-blog-ed-comments-0.4.4 updated 42 files
+4 βˆ’3 gatsby-config.js
+8 βˆ’8 package-lock.json
+1 βˆ’1 package.json
+3 βˆ’3 public/app-9af3b73c3bf39179c994.js
+1 βˆ’1 public/app-9af3b73c3bf39179c994.js.map
+1 βˆ’1 public/chunk-manifest.json
+7 βˆ’7 public/commons-89d60b5b924ef4c6771c.js
+1 βˆ’1 public/commons-89d60b5b924ef4c6771c.js.map
+2 βˆ’2 public/component---src-layouts-index-js-5396ae9128ed70808bc5.js
+1 βˆ’1 public/component---src-layouts-index-js-5396ae9128ed70808bc5.js.map
+1 βˆ’1 public/component---src-pages-index-js-51039b9bbfc98abe9adb.js
+1 βˆ’1 public/component---src-pages-index-js-51039b9bbfc98abe9adb.js.map
+4 βˆ’4 public/component---src-templates-blog-post-js-4a9510d18e5b63c08436.js
+1 βˆ’0 public/component---src-templates-blog-post-js-4a9510d18e5b63c08436.js.map
+0 βˆ’1 public/component---src-templates-blog-post-js-6196d8f470e3c3d19dda.js.map
+6 βˆ’5 public/hello-world/index.html
+6 βˆ’5 public/hi-folks/index.html
+5 βˆ’4 public/index.html
+6 βˆ’5 public/my-second-post/index.html
+5 βˆ’4 public/offline-plugin-app-shell-fallback/index.html
+0 βˆ’2 public/path---hello-world-c6a57048c72417ac098e.js
+0 βˆ’1 public/path---hello-world-c6a57048c72417ac098e.js.map
+2 βˆ’0 public/path---hello-world-d1bdaa95a605e44b3ac9.js
+1 βˆ’0 public/path---hello-world-d1bdaa95a605e44b3ac9.js.map
+0 βˆ’2 public/path---hi-folks-0177071fd2a1927dbdc6.js
+0 βˆ’1 public/path---hi-folks-0177071fd2a1927dbdc6.js.map
+2 βˆ’0 public/path---hi-folks-99017e317f7f96cf5ee4.js
+1 βˆ’0 public/path---hi-folks-99017e317f7f96cf5ee4.js.map
+2 βˆ’0 public/path---my-second-post-03a1035abe7561da95b0.js
+1 βˆ’0 public/path---my-second-post-03a1035abe7561da95b0.js.map
+0 βˆ’2 public/path---my-second-post-0d005c26d9b52cd86b8a.js
+0 βˆ’1 public/path---my-second-post-0d005c26d9b52cd86b8a.js.map
+0 βˆ’2 public/path---same-discussion-id-as-2nd-post-9412ca300b6671335aa3.js
+0 βˆ’1 public/path---same-discussion-id-as-2nd-post-9412ca300b6671335aa3.js.map
+2 βˆ’0 public/path---same-discussion-id-as-2nd-post-bfc0ee291cb1fc87949b.js
+1 βˆ’0 public/path---same-discussion-id-as-2nd-post-bfc0ee291cb1fc87949b.js.map
+1 βˆ’1 public/render-page.js.map
+1 βˆ’1 public/rss.xml
+6 βˆ’5 public/same-discussion-id-as-2nd-post/index.html
+14 βˆ’14 public/stats.json
+1 βˆ’1 public/sw.js
+2 βˆ’2 src/templates/blog-post.js
2 changes: 1 addition & 1 deletion modules/sanitize-html
2 changes: 1 addition & 1 deletion modules/ty-translations
2 changes: 1 addition & 1 deletion node_modules
Submodule node_modules updated 15943 files
2 changes: 1 addition & 1 deletion project/plugins.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ addSbtPlugin("com.typesafe.play" % "sbt-plugin" % "2.9.7")
// Docs: https://scalacenter.github.io/scalafix/
// There's plugins, e.g.: https://github.com/scala/scala-collection-compat?tab=readme-ov-file#collection213upgrade
// for upgrading collections from 2.12 to 2.13. (That plugin is added in ../build.sbt.)
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.2")
addSbtPlugin("ch.epfl.scala" % "sbt-scalafix" % "0.14.3")
// Can get [scala_2_13] migration help by doing?:
// scalafixAll dependency:Collection213Upgrade@org.scala-lang.modules:scala-collection-migrations:<version>
// where <version> is the scala-collection-migrations version?
Expand Down
2 changes: 1 addition & 1 deletion relchans/tyse-v0-dev
2 changes: 1 addition & 1 deletion relchans/tyse-v0-regular
Submodule tyse-v0-regular updated 1 files
+1 βˆ’0 version-tags.log
Original file line number Diff line number Diff line change
Expand Up @@ -242,6 +242,7 @@ describe("embcom.sort-order-op-likes-btn-txt.2br.ec TyTEMBSORTLIKETXT", () => {
it("Maria adds a comment", async () => {
// Wait until Maria's data added, otherwise if clicking Reply before that,
// the login dialog pops up and the test breaks.
// E2EBUG flappy & Breaks anyway, just like before.
await mariasBrowser.switchToEmbeddedCommentsIrame();
await mariasBrowser.waitForMyDataAdded();
await mariasBrowser.complex.replyToEmbeddingBlogPost("Hi I am here");
Expand Down
8 changes: 5 additions & 3 deletions tests/e2e-wdio7/specs/modn-ban-from-disc-page.2br.f.e2e.ts
Original file line number Diff line number Diff line change
Expand Up @@ -302,11 +302,12 @@ describe(`modn-ban-from-disc-page.2br.f TyTEBANFROMDISC`, () => {
it(`... it's been deleted`, async () => {
await modya_brA.topic.waitUntilPageDeleted();
});
/*
it(`... and Mallory's two comments (same page) also deleted`, async () => {
// Ooops but these won't be loaded ,since deld.
// Ooops but [deleted_comment_not_loaded].
await modya_brA.topic.waitForPostVisibleAsDeleted(c.FirstReplyNr);
await modya_brA.topic.waitForPostVisibleAsDeleted(c.SecondReplyNr);
});
}); */

it(`Modya goes to Mallory's other new topic`, async () => {
await modya_brA.go2(mallorysPagesFn().topicTwoUrl);
Expand All @@ -323,7 +324,8 @@ describe(`modn-ban-from-disc-page.2br.f TyTEBANFROMDISC`, () => {
const counts = await modya_brA.topic.countReplies();
assert.deepEq(counts, {
numNormal: 0, numDrafts: 0, numPreviews: 0, numUnapproved: 0,
// Deleted comments aren't loaded, unless there's non-deleted replies to them.
// Currently, [deleted_comment_not_loaded], unless there's non-deleted
// replies to them.
numDeleted: 0 });
});

Expand Down
1 change: 0 additions & 1 deletion tests/e2e-wdio7/utils/ty-e2e-test-browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5873,7 +5873,6 @@ export class TyE2eTestBrowser {
if (!isGone)
throw `Not yet gone: ${submitSelector}`;
});
await this.waitUntilModalGone();
}
};

Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v0.2025.007
v0.2025.008