Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Scala Adaptor#420

Merged
benjchristensen merged 33 commits intoReactiveX:masterfrom
samuelgruetter:scalaadaptor
Oct 9, 2013
Merged

Scala Adaptor#420
benjchristensen merged 33 commits intoReactiveX:masterfrom
samuelgruetter:scalaadaptor

Conversation

@samuelgruetter
Copy link
Contributor

Here are more improvements to the Scala adaptor, mostly changes in classes other than rx.lang.scala.Observable itself, as well as scaladoc for all classes. And the MovieLib example is now part of the rxjava-scala project instead of being a seperate project.

and tweak build.gradle to make this work
…ava-scala and delete project rxjava-scala-java
new Notification class with unapply (scalac crashes)
with the following replacements:

\{@link (\w+)#(\w+)\s+(\w+)\}
[[$1.$2 $3]]

\{@link (\w+)#(\w+)\((.*)\)\}
[[$1.$2($3)]]

\{@link #(\w+)\}
[[Observable.$1]]

\{@link (\w+)#(\w+)\}
[[$1.$2]]

<code>
`

</code>
`

\*\s*<p>\s*\n
*\n

\{@link (\w+)\}
[[$1]]

\{@link ((\w|\.)+)\}
[[$1]]

\[\[rx\.
[[rx.lang.scala.

\{@code\s*(([^}])+)\}
`$1`

@param <(\w+)>
@tparam $1

&lt;(\w+)&gt;
[$1]

<(\w+)>
[$1]

"timespan" argument
`timespan` argument

"timeshift" argument
`timeshift` argument

\[\[Action0\]\]
function

plus some manual replacements
rx.lang.scala.concurrency.UnitTest.testInterval fails
@cloudbees-pull-request-builder

RxJava-pull-requests #327 SUCCESS
This pull request looks good

@cloudbees-pull-request-builder

RxJava-pull-requests #328 SUCCESS
This pull request looks good

@benjchristensen
Copy link
Member

I'm just assuming this is all good from your side as I can't provide a useful review on this.

benjchristensen added a commit that referenced this pull request Oct 9, 2013
@benjchristensen benjchristensen merged commit 2bd22d6 into ReactiveX:master Oct 9, 2013
@samuelgruetter samuelgruetter deleted the scalaadaptor branch October 11, 2013 09:49
rickbw pushed a commit to rickbw/RxJava that referenced this pull request Jan 9, 2014
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants