Cross compile to SBT {0.13.16, 1.0.1} #510

suhasgaddam · 2017-09-06T16:07:23Z

No description provided.

suhasgaddam · 2017-09-06T16:15:13Z

.travis.yml

+      jdk: oraclejdk8
+      env:
+        - SBT_VERSION=1.0.1
+    - scala: 2.10.6


This might need to be 2.12.3 because sbt version in build.properties is 1.0.1, but we are compiling for 0.13.16 which requires 2.10.6. It might be a trial/error to see if one is faster than the other.

suhasgaddam · 2017-09-06T16:18:03Z

core/src/main/scala/sbtorgpolicies/github/GitHubOps.scala

@@ -25,6 +25,7 @@ import com.github.marklister.base64.Base64._
 import github4s.Github
 import github4s.GithubResponses._
 import github4s.free.domain._
+// import sbt.io.IO


The following

import sbt.io._ import sbt.io.syntax._

and the equivalent are the just "notes" and would be the imports if we were using purely sbt 1.0.

https://github.com/dwijnand/sbt-compat allows us to keep the equivalent sbt 0.13 imports.

👍 I think we could starting using those soon

Because of how sbt-compat, it exposes the sbt 1.0 api through the sbt 0.13 import statements. It's either that or have scala version specific source files where the only difference is something like

47deg-suhas:main suhas$ diff scala-2.10/sbtorgpolicies/io/io.scala scala-2.12/sbtorgpolicies/io/io.scala 24c24,25 < import sbt.{file, File} --- > import sbt.io._ > import sbt.io.syntax._

I think we'll need to keep this until we stop supporting sbt 0.13.

suhasgaddam · 2017-09-06T16:23:01Z

project/ProjectPlugin.scala

+
+    val crossScalaVersions: List[String] = List(`2.11`, `2.12`)
+
+  }


Better name for sbtV? I originally had sbt but that might inadvertently clash with the _root_.sbt

These will be removed once we have a snapshot published and use the corresponding sbtV and scalac in model.scala.

Probably, can't think a better one now so I'm good keeping it as it is for now ;)

suhasgaddam · 2017-09-06T16:27:18Z

project/ProjectPlugin.scala

+                sbtBinaryVersionValue,
+                scalaBinaryVersionValue)
+            )
+        }


https://github.com/tpolecat/tut
0.6.x -> sbt 1.x
0.5.x -> sbt 0.13.x

sbt-scalafmt -> I want to eventually switch to neo-sbt-scalafmt but I didn't then understand why scala 2.12 dependencies were getting pulled in for scalafmt-core. I currently kept different versions fot sbt-scalafmt to simply keep status quo.

Sounds good, let's open an issue to address that migration later on.

Switch to neo-sbt-scalafmt : #511

suhasgaddam · 2017-09-06T16:28:44Z

src/main/scala-2.10/sbtorgpolicies/settings/AllSettingsSpecific.scala

+import sbt.Keys._
+import sbt._
+
+trait AllSettingsSpecific extends dependencies {


Is there a naming convention for scala version specific files?

Naming things is always the hardest part 😛 .

Maybe just ScalaSettings?

More naming questions :)
How about dependenciesSpecific.scala? Or should I just merge both files under ScalaSettings?
https://github.com/47deg/sbt-org-policies/pull/510/files#diff-c498862754c166dea83d0b202b567241

@juanpedromoreno bump

We could merge it under ScalaSettings 👍

suhasgaddam · 2017-09-06T16:30:49Z

src/main/scala-2.10/sbtorgpolicies/settings/AllSettingsSpecific.scala

+      scalaOrganization.value % "scalap"         % scalaVersion.value
+    )
+  )
+}


dependencyOverrides ++= Set( / scala-2.10
vs
dependencyOverrides ++= Seq( / scala-2.12 (I need to look up how dependency precedence would work in this case)

suhasgaddam · 2017-09-06T16:34:30Z

src/sbt-test/sbtorgpolicies/custom-template-config/build.sbt

@@ -1,4 +1,4 @@
-import sbtorgpolicies.model._
+import sbtorgpolicies.model.{ApacheLicense, GitHubSettings}


I still don't completely understand why the wildcard import didn't work. It might be related to the original model.sbt object in model.scala I had.

suhasgaddam · 2017-09-06T17:06:34Z

https://github.com/47deg/sbt-org-policies/pull/510/files#diff-a84f91f20f040218bccd09fed4761fb3R5 and https://github.com/47deg/sbt-org-policies/pull/510/files#diff-4198f89a479a3a8c2b310affc814c14fR127 took me the longest time to figure out.

First link: I didn't notice the difference of % and %% for a long time.

scripted-plugin : 0.13.16 exists for scala-2.10
scripted-plugin_2.12 : 1.0.1 exists for scala-2.12

How I found out the second link was possible sbt/sbt#3473 (comment).

juanpedromoreno

LGTM, outstanding work!

Before merging, let's wait until @fedefernandez can take a look since there are some changes initially added by me.

juanpedromoreno · 2017-09-06T20:38:14Z

core/src/main/scala/sbtorgpolicies/github/GitHubOps.scala

@@ -25,6 +25,7 @@ import com.github.marklister.base64.Base64._
 import github4s.Github
 import github4s.GithubResponses._
 import github4s.free.domain._
+// import sbt.io.IO


👍 I think we could starting using those soon

juanpedromoreno · 2017-09-06T20:38:42Z

core/src/main/scala/sbtorgpolicies/libraries.scala

@@ -44,7 +44,7 @@ object libraries {
    "cats-effect"              -> "0.3",
    "circe"                    -> "0.8.0",
    "config"                   -> "1.3.1",
-    "coursier"                 -> "1.0.0-RC9",
+    "coursier"                 -> "1.0.0-RC10",


I think RC11 was already released.

juanpedromoreno · 2017-09-06T20:41:16Z

project/ProjectPlugin.scala

+
+    val crossScalaVersions: List[String] = List(`2.11`, `2.12`)
+
+  }


Probably, can't think a better one now so I'm good keeping it as it is for now ;)

juanpedromoreno · 2017-09-06T20:43:43Z

project/ProjectPlugin.scala

+
+        val scalaBinaryVersionValue = (scalaBinaryVersion in update).value
+
+        sbtVersionValue match {


Let's use this pattern match to only extract the tut and scalafmt deps, leaving just one Seq of settings at the end. What do you think?

Do you mean use the pattern match only and return ("0.5.3", "0.6.8") or ("0.6.0", "1.2.0")? DRY up the repeated group id and artifact id? If so, makes sense.

@juanpedromoreno bump

Yes, that's what I meant ;)

juanpedromoreno · 2017-09-06T20:44:33Z

project/ProjectPlugin.scala

+                sbtBinaryVersionValue,
+                scalaBinaryVersionValue)
+            )
+        }


Sounds good, let's open an issue to address that migration later on.

juanpedromoreno · 2017-09-06T20:45:07Z

project/build.properties

juanpedromoreno · 2017-09-06T20:47:07Z

src/main/scala-2.10/sbtorgpolicies/settings/AllSettingsSpecific.scala

+import sbt.Keys._
+import sbt._
+
+trait AllSettingsSpecific extends dependencies {


Naming things is always the hardest part 😛 .

Maybe just ScalaSettings?

suhasgaddam · 2017-09-07T19:03:45Z

@fedefernandez Can you look this PR over also?

fedefernandez

LGTM

fedefernandez · 2017-09-08T07:38:19Z

autocheck/project/plugins.sbt

@@ -1,2 +1,2 @@
 resolvers += Resolver.sonatypeRepo("snapshots")
-addSbtPlugin("com.47deg" % "sbt-org-policies" % sys.props("plugin.version"))
+addSbtPlugin("com.47deg" % "sbt-org-policies" % "0.6.0-SNAPSHOT")


I think we should keep the environment variable

juanpedromoreno and others added 8 commits August 10, 2017 17:54

Ports plugin to sbt 1.0.x [wip]

c861543

Port plugin to sbt {1.0.x, 0.13.16} [wip]

c337cc9

Break cycle

b377007

Clean up scala specific files

60e543d

Add shellPromptSettings and rename sbt to sbtV

67c8558

Merge remote-tracking branch 'origin/master' into sg-port-to-sbt-1.0.x

167cc13

Cleanup

5b0b8c7

Fix orgAutomateScalafmtFor/orgScalafmtIncDef/scalafmt for scala-2.12

9a79cf0

suhasgaddam requested review from fedefernandez and juanpedromoreno September 6, 2017 16:07

This was referenced Sep 6, 2017

Port plugin to sbt {1.0.x, 0.13.16} 47degrees/sbt-dependencies#30

Merged

Port plugin to sbt {1.0.x, 0.13.16} 47degrees/sbt-microsites#221

Merged

suhasgaddam commented Sep 6, 2017

View reviewed changes

Switch back to sbt-scalafmt in libraries.scala

55c1333

suhasgaddam commented Sep 6, 2017

View reviewed changes

juanpedromoreno approved these changes Sep 6, 2017

View reviewed changes

Bump coursier/sbt-coursier to 1.0.0-RC11

fc04375

fedefernandez approved these changes Sep 8, 2017

View reviewed changes

Cleanup based of PR review/comments

b2c902e

suhasgaddam merged commit b79af08 into master Sep 8, 2017

suhasgaddam deleted the sg-port-to-sbt-1.0.x branch September 8, 2017 16:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Cross compile to SBT {0.13.16, 1.0.1} #510

Cross compile to SBT {0.13.16, 1.0.1} #510

suhasgaddam commented Sep 6, 2017

suhasgaddam Sep 6, 2017

suhasgaddam Sep 6, 2017

juanpedromoreno Sep 6, 2017

suhasgaddam Sep 7, 2017

suhasgaddam Sep 6, 2017

juanpedromoreno Sep 6, 2017

suhasgaddam Sep 6, 2017

juanpedromoreno Sep 6, 2017

suhasgaddam Sep 6, 2017

suhasgaddam Sep 6, 2017

juanpedromoreno Sep 6, 2017

suhasgaddam Sep 6, 2017

suhasgaddam Sep 7, 2017

juanpedromoreno Sep 8, 2017

suhasgaddam Sep 6, 2017

suhasgaddam Sep 6, 2017

suhasgaddam commented Sep 6, 2017

juanpedromoreno left a comment

juanpedromoreno Sep 6, 2017

juanpedromoreno Sep 6, 2017

juanpedromoreno Sep 6, 2017

juanpedromoreno Sep 6, 2017

suhasgaddam Sep 6, 2017 •

edited

Loading

suhasgaddam Sep 7, 2017

juanpedromoreno Sep 8, 2017

juanpedromoreno Sep 6, 2017

juanpedromoreno Sep 6, 2017

juanpedromoreno Sep 6, 2017

suhasgaddam commented Sep 7, 2017

fedefernandez left a comment

fedefernandez Sep 8, 2017


		val crossScalaVersions: List[String] = List(`2.11`, `2.12`)

		}

		@@ -1,4 +1,4 @@
		import sbtorgpolicies.model._
		import sbtorgpolicies.model.{ApacheLicense, GitHubSettings}


		val scalaBinaryVersionValue = (scalaBinaryVersion in update).value

		sbtVersionValue match {

Cross compile to SBT {0.13.16, 1.0.1} #510

Cross compile to SBT {0.13.16, 1.0.1} #510

Conversation

suhasgaddam commented Sep 6, 2017

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suhasgaddam commented Sep 6, 2017

juanpedromoreno left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suhasgaddam Sep 6, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suhasgaddam commented Sep 7, 2017

fedefernandez left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

suhasgaddam Sep 6, 2017 •

edited

Loading