Merge pull request #536 from scala-js/topic/merge1x

Merge branch 'series/1.x' into `master`

Author: japgolly

build.sbt

@@ -37,7 +37,7 @@ name := "Scala.js DOM"
 ThisBuild / crossScalaVersions := Seq("2.11.12", "2.12.14", "2.13.6", "3.0.1")
 ThisBuild / scalaVersion := crossScalaVersions.value.find(_.startsWith("2.13.")).get
 
-val inCI = Option(System.getenv("CI")).exists(_.contains("1"))
+val inCI = sys.props.get("CI").exists(_.contains("1"))
 
 val commonSettings = Seq(
   organization := "org.scala-js",
@@ -94,11 +94,6 @@ pomExtra := (
         <name>David Barri</name>
         <url>https://github.com/japgolly</url>
       </developer>
-      <developer>
-        <id>lihaoyi</id>
-        <name>Li Haoyi</name>
-        <url>https://github.com/lihaoyi/</url>
-      </developer>
       <developer>
         <id>armanbilge</id>
         <name>Arman Bilge</name>
@@ -114,6 +109,11 @@ pomExtra := (
         <name>Tobias Schlatter</name>
         <url>https://github.com/gzm0/</url>
       </developer>
+      <developer>
+        <id>lihaoyi</id>
+        <name>Li Haoyi</name>
+        <url>https://github.com/lihaoyi/</url>
+      </developer>
     </developers>
 )