<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN" "http://www.w3.org/TR/REC-html40/loose.dtd">
<html lang="en">
<head>
<meta content="text/html; charset=US-ASCII" http-equiv="Content-Type">
<title>
GitLab
</title>
<style>img {
max-width: 100%; height: auto;
}
</style>
</head>
<body>
<div class="content">
<h3>
Tony Mancill pushed to branch upstream
at <a href="https://salsa.debian.org/java-team/scala-tools-sbinary">Debian Java Maintainers / scala-tools-sbinary</a>
</h3>
<h4>
Commits:
</h4>
<ul>
<li>
<strong><a href="https://salsa.debian.org/java-team/scala-tools-sbinary/-/commit/71c6ce95a1a6b89eb6af9aba67488e810cce158c">71c6ce95</a></strong>
<div>
<span>by Manas Kashyap</span>
<i>at 2020-04-12T10:54:19+05:30</i>
</div>
<pre class="commit-message" style="white-space: pre-wrap; margin: 0;">New upstream version 0.4.2-on-scala-2.11.0~M5</pre>
</li>
</ul>
<h4>2 changed files:</h4>
<ul>
<li class="file-stats">
<a href="#d3e78b9dc1740e236e64d9b022046149353ead69">
project/SBinaryProject.scala
</a>
</li>
<li class="file-stats">
<a href="#86c7bed3e63c403cb8322acb81cfb01cb52ebd23">
<span class="new-file">
+
project/build.properties
</span>
</a>
</li>
</ul>
<h4>Changes:</h4>
<li id="d3e78b9dc1740e236e64d9b022046149353ead69">
<a href="https://salsa.debian.org/java-team/scala-tools-sbinary/-/commit/71c6ce95a1a6b89eb6af9aba67488e810cce158c#d3e78b9dc1740e236e64d9b022046149353ead69"><strong>project/SBinaryProject.scala</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder match" id="" style="line-height: 1.6;">
<td class="diff-line-num unfold js-unfold old_line" data-linenumber="31" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="diff-line-num unfold js-unfold new_line" data-linenumber="31" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">...</td>
<td class="line_content match " style="padding-left: 0.5em; padding-right: 0.5em; color: rgba(0,0,0,0.3);" bgcolor="#fafafa">@@ -31,7 +31,7 @@ object SBinaryProject extends Build</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="31" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
31
</td>
<td class="diff-line-num new_line" data-linenumber="31" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
31
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC31" class="line" lang="scala"> <span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">aux</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">nameString</span><span class="k" style="font-weight: 600;">:</span> <span class="kt" style="color: #458; font-weight: 600;">String</span><span class="o" style="font-weight: 600;">)</span> <span class="k" style="font-weight: 600;">=</span> <span class="n" style="color: #333;">commonSettings</span> <span class="o" style="font-weight: 600;">++</span> <span class="nc" style="color: #458; font-weight: 600;">Seq</span><span class="o" style="font-weight: 600;">(</span> <span class="n" style="color: #333;">publish</span> <span class="o" style="font-weight: 600;">:=</span> <span class="o" style="font-weight: 600;">(),</span> <span class="n" style="color: #333;">name</span> <span class="o" style="font-weight: 600;">:=</span> <span class="n" style="color: #333;">nameString</span> <span class="o" style="font-weight: 600;">)</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="32" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
32
</td>
<td class="diff-line-num new_line" data-linenumber="32" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
32
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC32" class="line" lang="scala"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="33" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
33
</td>
<td class="diff-line-num new_line" data-linenumber="33" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
33
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC33" class="line" lang="scala"> <span class="k" style="font-weight: 600;">def</span> <span class="nf" style="color: #900; font-weight: 600;">scalaXmlDep</span><span class="o" style="font-weight: 600;">(</span><span class="n" style="color: #333;">scalaV</span><span class="k" style="font-weight: 600;">:</span> <span class="kt" style="color: #458; font-weight: 600;">String</span><span class="o" style="font-weight: 600;">)</span><span class="k" style="font-weight: 600;">:</span> <span class="kt" style="color: #458; font-weight: 600;">List</span><span class="o" style="font-weight: 600;">[</span><span class="kt" style="color: #458; font-weight: 600;">ModuleID</span><span class="o" style="font-weight: 600;">]</span> <span class="k" style="font-weight: 600;">=</span></span>
</pre>
</td>
</tr>
<tr class="line_holder old" id="" style="line-height: 1.6;">
<td class="diff-line-num old old_line" data-linenumber="34" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
34
</td>
<td class="diff-line-num new_line old" data-linenumber="34" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #fac5cd; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#f9d7dc">
</td>
<td class="line_content old" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#fbe9eb">
<pre style="margin: 0;">-<span id="LC34" class="line" lang="scala"> <span class="nf" style="color: #900; font-weight: 600;">if</span><span class="o" style="font-weight: 600;">(</span><span class="nv" style="color: #008080;">scalaV</span><span class="o" style="font-weight: 600;">.</span><span class="py">startsWith</span><span class="o" style="font-weight: 600;">(</span><span class="s" style="color: #d14;">"2.11."</span><span class="o" style="font-weight: 600;">))</span> <span class="nc" style="color: #458; font-weight: 600;">List</span><span class="o" style="font-weight: 600;">(</span><span class="s" style="color: #d14;">"org.scala-lang<span class="idiff left">"</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">%</span></span><span class="idiff"> </span><span class="s" style="color: #d14;"><span class="idiff">"scala-xml"</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">%</span></span><span class="idiff"> </span><span class="n" style="color: #333;"><span class="idiff right">scalaV</span></span><span class="o" style="font-weight: 600;">)</span> <span class="k" style="font-weight: 600;">else</span> <span class="nc" style="color: #458; font-weight: 600;">Nil</span></span>
</pre>
</td>
</tr>
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="35" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="34" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
34
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC34" class="line" lang="scala"> <span class="nf" style="color: #900; font-weight: 600;">if</span><span class="o" style="font-weight: 600;">(</span><span class="nv" style="color: #008080;">scalaV</span><span class="o" style="font-weight: 600;">.</span><span class="py">startsWith</span><span class="o" style="font-weight: 600;">(</span><span class="s" style="color: #d14;">"2.11."</span><span class="o" style="font-weight: 600;">))</span> <span class="nc" style="color: #458; font-weight: 600;">List</span><span class="o" style="font-weight: 600;">(</span><span class="s" style="color: #d14;">"org.scala-lang<span class="idiff left">.modules"</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">%%</span></span><span class="idiff"> </span><span class="s" style="color: #d14;"><span class="idiff">"scala-xml"</span></span><span class="idiff"> </span><span class="o" style="font-weight: 600;"><span class="idiff">%</span></span><span class="idiff"> </span><span class="s" style="color: #d14;"><span class="idiff right">"1.0-RC2"</span></span><span class="o" style="font-weight: 600;">)</span> <span class="k" style="font-weight: 600;">else</span> <span class="nc" style="color: #458; font-weight: 600;">Nil</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="35" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
35
</td>
<td class="diff-line-num new_line" data-linenumber="35" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
35
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC35" class="line" lang="scala"></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="36" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
36
</td>
<td class="diff-line-num new_line" data-linenumber="36" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
36
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC36" class="line" lang="scala"> <span class="cm" style="color: #998; font-style: italic;">/*** Templating **/</span></span>
</pre>
</td>
</tr>
<tr class="line_holder" id="" style="line-height: 1.6;">
<td class="diff-line-num old_line" data-linenumber="37" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
37
</td>
<td class="diff-line-num new_line" data-linenumber="37" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #f0f0f0; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#fafafa">
37
</td>
<td class="line_content" style="padding-left: 0.5em; padding-right: 0.5em;">
<pre style="margin: 0;"> <span id="LC37" class="line" lang="scala"></span>
</pre>
</td>
</tr>
</table>
<br>
</li>
<li id="86c7bed3e63c403cb8322acb81cfb01cb52ebd23">
<a href="https://salsa.debian.org/java-team/scala-tools-sbinary/-/commit/71c6ce95a1a6b89eb6af9aba67488e810cce158c#86c7bed3e63c403cb8322acb81cfb01cb52ebd23"><strong>project/build.properties</strong></a>
<hr>
<table class="code white" style="font-family: monospace; font-size: 90%;" bgcolor="#fff" width="100%" cellpadding="0" cellspacing="0">
<tr class="line_holder new" id="" style="line-height: 1.6;">
<td class="diff-line-num new old_line" data-linenumber="0" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
</td>
<td class="diff-line-num new new_line" data-linenumber="1" style="width: 35px; color: rgba(0,0,0,0.3); border-right-width: 1px; border-right-color: #c7f0d2; border-right-style: solid; padding: 0 5px;" align="right" bgcolor="#ddfbe6">
1
</td>
<td class="line_content new" style="padding-left: 0.5em; padding-right: 0.5em;" bgcolor="#ecfdf0">
<pre style="margin: 0;">+<span id="LC1" class="line" lang="properties"><span class="py">sbt.version</span><span class="p">=</span><span class="s" style="color: #d14;">0.12.4</span></span></pre>
</td>
</tr>
</table>
<br>
</li>
</div>
<div class="footer" style="margin-top: 10px;">
<p style="font-size: small; color: #777;">
—
<br>
<a href="https://salsa.debian.org/java-team/scala-tools-sbinary/-/commit/71c6ce95a1a6b89eb6af9aba67488e810cce158c">View it on GitLab</a>.
<br>
You're receiving this email because of your account on salsa.debian.org.
If you'd like to receive fewer emails, you can
adjust your notification settings.
<script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","action":{"@type":"ViewAction","name":"View Commit","url":"https://salsa.debian.org/java-team/scala-tools-sbinary/-/commit/71c6ce95a1a6b89eb6af9aba67488e810cce158c"}}</script>
</p>
</div>
</body>
</html>