From 674629924a805827f575b0b7d481721f0e99d3a7 Mon Sep 17 00:00:00 2001 From: danicheg Date: Sat, 25 Jun 2022 22:35:00 +0400 Subject: [PATCH 1/2] Add separate top-level mouse object for JS in Scala 2 --- .../{scala => scala-2}/mouse/package.scala | 0 js/src/main/scala-3/mouse/TupleSyntax.scala | 24 ------------------- 2 files changed, 24 deletions(-) rename js/src/main/{scala => scala-2}/mouse/package.scala (100%) delete mode 100644 js/src/main/scala-3/mouse/TupleSyntax.scala diff --git a/js/src/main/scala/mouse/package.scala b/js/src/main/scala-2/mouse/package.scala similarity index 100% rename from js/src/main/scala/mouse/package.scala rename to js/src/main/scala-2/mouse/package.scala diff --git a/js/src/main/scala-3/mouse/TupleSyntax.scala b/js/src/main/scala-3/mouse/TupleSyntax.scala deleted file mode 100644 index 60b885cd..00000000 --- a/js/src/main/scala-3/mouse/TupleSyntax.scala +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2016 Typelevel - * - * Permission is hereby granted, free of charge, to any person obtaining a copy of - * this software and associated documentation files (the "Software"), to deal in - * the Software without restriction, including without limitation the rights to - * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of - * the Software, and to permit persons to whom the Software is furnished to do so, - * subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS - * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR - * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER - * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN - * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -package mouse - -private[mouse] trait TupleSyntax From 0919ca8ea6c2fd895459c6963b700f38f3500fe1 Mon Sep 17 00:00:00 2001 From: danicheg Date: Sat, 25 Jun 2022 22:35:14 +0400 Subject: [PATCH 2/2] Add separate top-level mouse object for JS in Scala 3 --- js/src/main/scala-3/mouse/package.scala | 39 +++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100644 js/src/main/scala-3/mouse/package.scala diff --git a/js/src/main/scala-3/mouse/package.scala b/js/src/main/scala-3/mouse/package.scala new file mode 100644 index 00000000..54409831 --- /dev/null +++ b/js/src/main/scala-3/mouse/package.scala @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2016 Typelevel + * + * Permission is hereby granted, free of charge, to any person obtaining a copy of + * this software and associated documentation files (the "Software"), to deal in + * the Software without restriction, including without limitation the rights to + * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of + * the Software, and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in all + * copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS + * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR + * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER + * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + */ + +package object mouse extends MouseFunctions { + object all extends AllSharedSyntax with AllJsSyntax + object any extends AnySyntax + object anyf extends AnyFSyntax + object boolean extends BooleanSyntax + object double extends DoubleSyntax + object fboolean extends FBooleanSyntax + object feither extends FEitherSyntax + object fnested extends FNestedSyntax + object foption extends FOptionSyntax + object ftuple extends FTupleSyntax + object int extends IntSyntax + object long extends LongSyntax + object map extends MapSyntax + object option extends OptionSyntax + object string extends StringSyntax + object `try` extends TrySyntax +}