Issue/84 #86

Sciss · 2018-12-12T15:31:18Z

Ok, my attempt at the same thing. Sorry, commit is big due to clean-ups. What's mainly missing is ListView.selection.items. You can ignore the examples (they are just clean-up).

Fixes #84

- add explicit return types (e.g. Proxy's self now is Any) - fully qualify imports, avoid wildcard imports - remove dummy class Matrix

@som-snytt

- introduce SetWrapper and MapWrapper, similar to @som-snytt 's shims (seems we can't do without) - clean up code - add scala.swing.Seq alias (as in @som-snytt 's version) - TODO: ListView#selection.items is still `???`

Sciss · 2018-12-12T16:23:58Z

Looking at https://github.com/Sciss/SwingPlus now to see how far we get with the new version. It seems that the different collection type for insertAll is very unfortunate, and thus it would be best to add a type alias to package.scala

Sciss · 2018-12-12T16:26:11Z

package-private BufferWrapper is also not good.

- this mirrors the provisions of buffer-wrapper and is needed by third party swing extensions to avoid forking sources between Scala 2.12 and 2.13 - also provide a default `clear` implementation

Sciss · 2018-12-16T18:12:26Z

I managed to build my entire desktop application tree now; from what I can see, all seems to be fine, so this PR is ready for review. Anyone? @SethTisue @benhutchison @som-snytt

README.md

src/main/scala/scala/swing/Publisher.scala

src/main/scala/scala/swing/package.scala

benhutchison · 2018-12-16T20:47:23Z

src/main/scala/scala/swing/package.scala

@@ -14,6 +22,8 @@ package object swing {
  type Image      = java.awt.Image
  type Font       = java.awt.Font

+  type Seq[+A]    = scala.collection.Seq[A] // because scala.Seq differs between Scala 2.12 and 2.13
+


I dont understand what this line is for..

It can be removed and two spots fully qualified instead: Container.Wrapper.contents and ListView.selection.items. Also Container.contents.

On the other hand, I found it quite handy in other libs to use swing.Seq. But I guess that's a bit idiosyncratic. So I remove it?

On the other hand, I found it quite handy in other libs to use swing.Seq. But I guess that's a bit idiosyncratic. So I remove it?

@som-snytt Seq is used in more than those three places: ComboBox, Container, FileChooser, ListView, Menu, RichWindow, RootPanel, ScrollPane, SplitPane, Table. I'd say it's better and safer to have a type alias in the swing package object.

Im fine with that if you want @Sciss

I'd remove it, I think it can be confusing. If you were writing the library now, for 2.13, would you create such an alias?

- remove the commented former and unused class `RefBuffer` - add more information about architecture (events) to read-me; update information about versions and branches

Sciss · 2018-12-17T00:39:51Z

created branch work from 2.0.x which can serve as basis for further development. Since versions are tagged, I don't think we need one branch per each new version. Updated README accordingly.

benhutchison · 2018-12-17T00:51:27Z

Agree that we should keep minimum branches, I like that there's just one branch to worry about for the future.

SethTisue · 2018-12-17T14:34:29Z

I probably won't be able to look until January, perhaps @lrytz could take a look

lrytz

Looks good!

lrytz · 2018-12-18T07:26:47Z

src/main/scala/scala/swing/package.scala

@@ -14,6 +22,8 @@ package object swing {
  type Image      = java.awt.Image
  type Font       = java.awt.Font

+  type Seq[+A]    = scala.collection.Seq[A] // because scala.Seq differs between Scala 2.12 and 2.13
+


I'd remove it, I think it can be confusing. If you were writing the library now, for 2.13, would you create such an alias?

benhutchison · 2018-12-18T07:40:43Z

All good from me

Sciss · 2018-12-18T10:46:04Z

@lrytz ok - so I removed swing.Seq; I took the opportunity, though, to move to immutable.Seq now where possible and reasonable.

- we leave scala.collection.Seq where the API would use Java Arrays, so we do not get sub-par performance in 2.13 - we use the more strict type immutable.Seq where its effortless and actually ensures correct behaviour. Since we are in a binary incompatible new scala-swing version, in the worst case user code that used Array in Scala <2.13 would have to enforce toList, toVector or similar

- the previous signature `selectedFiles_=(files: File*)` does not make sense, because we want to write that without parentheses, and getter and setter should have matching arguments. Use s.c.Seq now in both cases.

Sciss · 2018-12-18T10:58:43Z

If no more objection, I will merge this tonight, and then bump version to stable 2.1.0 -- who would be responsible for pushing the new artifacts to Maven Central?

lrytz · 2018-12-18T12:00:36Z

move to immutable.Seq now where possible and reasonable.

I think that's great! This sounds like it should go in a major release though?

Sciss · 2018-12-18T12:15:00Z

I think that's great! This sounds like it should go in a major release though?

I did this since we are already on a new major version 2.1.0 (previous is 2.0.x) due to several changes. I have compiled multiple projects now with the snapshot; it should be source compatible for almost all cases.

lrytz · 2018-12-18T12:19:56Z

Great! I can click the buttons to release the artifacts to maven central, just ping me.

Sciss · 2018-12-18T12:26:25Z

@lrytz ok - good to go then! the only thing missing would be to change version to "2.1.0" instead of "2.1.0-SNAPSHOT" in build.sbt, after merging the PR and before publishing.

benhutchison · 2018-12-26T02:30:02Z

Lets pull the trigger on this.. @Sciss OK to merge?

Sciss · 2018-12-26T13:31:02Z

@benhutchison are you familiar with https://github.com/scala/scala-swing/tree/work/admin#tag-driven-releasing - if so, could you bump to 2.1.0 stable, tag and publish?

benhutchison · 2018-12-26T22:05:30Z

Done. The releases have gone to Sonatype staging and all looks normal. @lrytz <https://github.com/lrytz> please release. Note Im heading on post-Xmas family beach vacation (it's summer in Australia) today, packing the car now, so will be only online intermittently for next week.

…

On Thu, Dec 27, 2018 at 12:31 AM Hanns Holger Rutz ***@***.***> wrote: @benhutchison <https://github.com/benhutchison> are you familiar with https://github.com/scala/scala-swing/tree/work/admin#tag-driven-releasing - if so, could you bump to 2.1.0 stable, tag and publish? — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#86 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAF05DUbbOjEqbp8ZBBDxe9VavarR1vEks5u83oWgaJpZM4ZPrCO> .

Sciss · 2018-12-26T22:32:30Z

Note that the version in build.sbt that has the git-tag v2.1.0 still says "2.1.0-SNAPSHOT". So probably it needs another commit with that incremented.

benhutchison · 2018-12-26T23:42:47Z

Good catch Sciss. I've packed my laptop in car, please make change if you can.

…

On Thu., 27 Dec. 2018, 9:32 am Hanns Holger Rutz ***@***.*** wrote: Note that the version in build.sbt that has the git-tag v2.1.0 still says "2.1.0-SNAPSHOT". So probably it needs another commit with that incremented. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#86 (comment)>, or mute the thread <https://github.com/notifications/unsubscribe-auth/AAF05D5w3HRJNWWIoezNkELPdtJM5bh0ks5u8_j-gaJpZM4ZPrCO> .

Sciss · 2018-12-27T09:42:35Z

@lrytz Lukas, could you please check in to sonatype and release the artifacts? Double check, because since I moved the v2.1.0 tag to the new commit with the stable version in build.sbt, Travis published again, so I don't know if it just overwrites the previously staged files or not.

As far as I can tell, Ben's release didn't make it to Maven Central yet:
https://search.maven.org/search?q=g:org.scala-lang.modules%20AND%20a:scala-swing_2.12&core=gav

SethTisue · 2018-12-28T16:03:55Z

It's no big deal, but I don't think there was any need to move the v2.1.0 tag. The version in the published artifacts is determined by the tag, overriding the version setting, so it's fine to bump that setting after publishing.

Anyway, I don't understand exactly what happened, but somehow we ended up in a confused situation where the staging repos ended up with a mix of artifacts from the two different attempts, with different checksums.

It seems likely to me that the artifacts from either attempt are fine, but the whole thing makes me nervous. So I dropped all four staging repos (1658 through 1661), deleted the v2.1.0 tag, and then re-pushed the tag.

The new Travis job is https://travis-ci.org/scala/scala-swing/builds/473049546

Sciss · 2018-12-28T16:05:50Z

@SethTisue ok thank you. The problem with the alignment of the tag is also that, for example, in GitHub releases you download attached sources that don't correspond with the maven sources, because version was still 2.1.0-SNAPSHOT.

I don't know what the general procedure is next time, but I think it's best to match build.sbt version with git tag. ?

SethTisue · 2018-12-28T16:07:48Z

I don't know what the general procedure is next time, but I think it's best to match build.sbt version with git tag. ?

It certainly can't hurt!

Sciss · 2018-12-28T16:08:34Z

I would follow roughly this: https://github.com/sbt/sbt-release#release-process

So, after release, merge to master, then push another commit to have the next SNAPSHOT in work.

SethTisue · 2018-12-28T16:14:32Z

staging repos 1662 and 1663 closed and released, artifacts should be on their way to Maven Central

SethTisue · 2018-12-28T16:52:38Z

Sciss added 3 commits December 12, 2018 14:04

clean up; bump to 2.1.0-SNAPSHOT

8407cac

- add explicit return types (e.g. Proxy's self now is Any) - fully qualify imports, avoid wildcard imports - remove dummy class Matrix

cross-compiles Scala 2.11, 2.12, 2.13.0-M5.

ca1579e

- introduce SetWrapper and MapWrapper, similar to @som-snytt 's shims (seems we can't do without) - clean up code - add scala.swing.Seq alias (as in @som-snytt 's version) - TODO: ListView#selection.items is still `???`

implement missing methods in 2.13 buffer-wrapper; insertAt -> insert

e9e1efc

make coll. wrapper classes usable by other libs; seq alias variance

041d1ef

Sciss force-pushed the issue/84 branch from ccbc5f3 to 231583e Compare December 12, 2018 22:27

list-view selection items is read only

466d7f6

Sciss force-pushed the issue/84 branch from 231583e to 466d7f6 Compare December 12, 2018 22:32

add cross-scala way for set and map adaptors' addAll/subtractAll

c228e6f

- this mirrors the provisions of buffer-wrapper and is needed by third party swing extensions to avoid forking sources between Scala 2.12 and 2.13 - also provide a default `clear` implementation

benhutchison reviewed Dec 16, 2018

View reviewed changes

README.md Outdated Show resolved Hide resolved

benhutchison reviewed Dec 16, 2018

View reviewed changes

src/main/scala/scala/swing/Publisher.scala Show resolved Hide resolved

benhutchison reviewed Dec 16, 2018

View reviewed changes

src/main/scala/scala/swing/package.scala Outdated Show resolved Hide resolved

benhutchison reviewed Dec 16, 2018

View reviewed changes

clean up readme; remove commented stale code

acf7c70

- remove the commented former and unused class `RefBuffer` - add more information about architecture (events) to read-me; update information about versions and branches

Sciss changed the base branch from 2.0.x to work December 17, 2018 00:38

lrytz approved these changes Dec 18, 2018

View reviewed changes

Sciss force-pushed the issue/84 branch from 07ef35f to 72fd1d6 Compare December 18, 2018 10:52

FileChooser selectedFiles_= should not use var-args

15c7223

- the previous signature `selectedFiles_=(files: File*)` does not make sense, because we want to write that without parentheses, and getter and setter should have matching arguments. Use s.c.Seq now in both cases.

Sciss merged commit 3566a92 into scala:work Dec 26, 2018

Sciss deleted the issue/84 branch December 28, 2018 16:44

Issue/84 #86

Issue/84 #86

Uh oh!

Conversation

Sciss commented Dec 12, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Sciss commented Dec 12, 2018

Uh oh!

Sciss commented Dec 12, 2018

Uh oh!

Sciss commented Dec 16, 2018

Uh oh!

Uh oh!

Uh oh!

Uh oh!

benhutchison Dec 16, 2018

Choose a reason for hiding this comment

Uh oh!

som-snytt Dec 16, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Sciss Dec 16, 2018

Choose a reason for hiding this comment

Uh oh!

Sciss Dec 16, 2018

Choose a reason for hiding this comment

Uh oh!

Sciss Dec 17, 2018

Choose a reason for hiding this comment

Uh oh!

benhutchison Dec 17, 2018

Choose a reason for hiding this comment

Uh oh!

lrytz Dec 18, 2018

Choose a reason for hiding this comment

Uh oh!

Sciss commented Dec 17, 2018

Uh oh!

benhutchison commented Dec 17, 2018

Uh oh!

SethTisue commented Dec 17, 2018

Uh oh!

lrytz left a comment

Choose a reason for hiding this comment

Uh oh!

lrytz Dec 18, 2018

Choose a reason for hiding this comment

Uh oh!

benhutchison commented Dec 18, 2018

Uh oh!

Sciss commented Dec 18, 2018

Uh oh!

Sciss commented Dec 18, 2018

Uh oh!

lrytz commented Dec 18, 2018

Uh oh!

Sciss commented Dec 18, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

lrytz commented Dec 18, 2018

Uh oh!

Sciss commented Dec 18, 2018

Uh oh!

benhutchison commented Dec 26, 2018

Uh oh!

Sciss commented Dec 26, 2018

Uh oh!

benhutchison commented Dec 26, 2018 via email

Uh oh!

Sciss commented Dec 26, 2018

Uh oh!

benhutchison commented Dec 26, 2018 via email

Uh oh!

Sciss commented Dec 27, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

SethTisue commented Dec 28, 2018 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Sciss commented Dec 12, 2018 •

edited

Loading

som-snytt Dec 16, 2018 •

edited

Loading

Sciss commented Dec 18, 2018 •

edited

Loading

Sciss commented Dec 27, 2018 •

edited

Loading

SethTisue commented Dec 28, 2018 •

edited

Loading

Sciss commented Dec 28, 2018 •

edited

Loading