Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion build.sbt
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ lazy val V =
def semanticdbKotlinc = "0.2.0"
def testcontainers = "0.39.3"
def requests = "0.6.5"
def minimalMillVersion = "0.10.0"
def millScipVersion = "0.2.2"
}

inThisBuild(
Expand Down Expand Up @@ -166,7 +168,9 @@ lazy val cli = project
"scala213" -> V.scala213,
"scala3" -> V.scala3,
"bloopVersion" -> V.bloop,
"bspVersion" -> V.bsp
"bspVersion" -> V.bsp,
"minimalMillVersion" -> V.minimalMillVersion,
"millScipVersion" -> V.millScipVersion
),
buildInfoPackage := "com.sourcegraph.scip_java",
libraryDependencies ++=
Expand Down
14 changes: 12 additions & 2 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,7 @@ free to subscribe to the tracking issues to receive updates on your build tool.
| Ant | ❌ | ❌ | ❌ | [sourcegraph/scip-java#305](https://github.com/sourcegraph/scip-java/issues/305) |
| Bazel | ✅ | ✅ | ❌ | |
| Buck | ❌ | ❌ | ❌ | [sourcegraph/scip-java#99](https://github.com/sourcegraph/scip-java/issues/99) |
| Mill | ❌ | | ❌ | [sourcegraph/scip-java#306](https://github.com/sourcegraph/scip-java/issues/306) |
| Mill | ❌ | | ❌ |

**✅**: automatic indexing is fully supported. Please report a bug if the
`scip-java index` command does not work on your codebase.
Expand Down Expand Up @@ -292,13 +292,23 @@ The following Maven integrations are not yet supported:

### sbt

The `scip-java index` build should be able to automatically index most Maven
The `scip-java index` build should be able to automatically index most sbt
projects, with the following caveats:

| Integration | Supported | Recommendation |
| ------------- | --------- | ----------------------- |
| sbt <v0.13.17 | ❌ | Upgrade to sbt v0.13.17 |

### Mill

The `scip-java index` build should be able to automatically index most Mill
projects, with the following caveats:

| Integration | Supported | Recommendation |
| ------------- | --------- | -------------------------- |
| Mill <v0.10.0 | ❌ | Upgrade to Mill >= v0.10.0 |


### Bazel

Bazel is supported by scip-java but it requires custom configuration to work
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,8 @@ object BuildTool {
new GradleBuildTool(index),
new MavenBuildTool(index),
new ScipBuildTool(index),
new SbtBuildTool(index)
new SbtBuildTool(index),
new MillBuildTool(index)
)
def allNames: String =
all(IndexCommand()).filterNot(_.isHidden).map(_.name).mkString(", ")
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,103 @@
package com.sourcegraph.scip_java.buildtools

import java.nio.file.Files
import java.nio.file.StandardCopyOption

import scala.jdk.CollectionConverters._

import com.sourcegraph.scip_java.BuildInfo
import com.sourcegraph.scip_java.commands.IndexCommand

class MillBuildTool(index: IndexCommand) extends BuildTool("mill", index) {

override def usedInCurrentDirectory(): Boolean =
Files.isRegularFile(index.workingDirectory.resolve("build.sc"))

override def generateScip(): Int =
millVersion() match {
case Some(version) if isSupportedMillVersion(version) =>
unconditionallyGenerateScip()
case Some(version) =>
failFast(
s"Unsupported Mill version '${version}'. " +
s"To fix this problem, upgrade Mill to at least ${minimalMillVersion} and try again."
)
case None =>
failFast(
s"No Mill version detected. " +
s"To fix this problem, run the following command and try again: " +
s"echo '${minimalMillVersion}' >> .mill-version"
)
}

private def failFast(message: String): Int = {
index.app.error(message)
1
}

private def unconditionallyGenerateScip(): Int = {
val localMill = Files.isRegularFile(millFile)
val command =
if (localMill) {
"./mill"
} else {
"mill"
}
val millProcess = index.process(
List(
command,
"--import",
s"ivy:io.chris-kipp::mill-scip::${BuildInfo.millScipVersion}",
"io.kipp.mill.scip.Scip/generate"
)
)
val scipFile = index
.workingDirectory
.resolve("out")
.resolve("io")
.resolve("kipp")
.resolve("mill")
.resolve("scip")
.resolve("Scip")
.resolve("generate.dest")
.resolve("index.scip")

if (millProcess.exitCode == 0 && Files.isRegularFile(scipFile)) {
val output = index.workingDirectory.resolve("index.scip")
Files.copy(scipFile, output, StandardCopyOption.REPLACE_EXISTING)
index.app.info(output.toString)
}
millProcess.exitCode
}

private lazy val minimalMillVersion = BuildInfo.minimalMillVersion

private lazy val millFile = index.workingDirectory.resolve("mill")

private def isSupportedMillVersion(version: String): Boolean =
if (version.startsWith("0.1"))
true
else
false

/**
* Try to grab the Mill version from the .mill-version file. If not found we
* fall back to the mill file which could be the official mill launcher or the
* millw launcher renamed as mill, both which will have a DEFAULT_MILL_VERSION
* line.
*/
private def millVersion(): Option[String] = {
val millVersionFile = index.workingDirectory.resolve(".mill-version")
if (Files.isRegularFile(millVersionFile)) {
Files.readAllLines(millVersionFile).asScala.headOption
} else if (Files.isRegularFile(millFile)) {
Files
.readAllLines(millFile)
.asScala
.find(_.startsWith("DEFAULT_MILL_VERSION"))
.map(line => line.dropWhile(!_.isDigit))
} else {
None
}
}
}
171 changes: 171 additions & 0 deletions tests/buildTools/src/test/resources/mill
Original file line number Diff line number Diff line change
@@ -0,0 +1,171 @@
#!/usr/bin/env sh

# This is a wrapper script, that automatically download mill from GitHub release pages
# You can give the required mill version with --mill-version parameter
# If no version is given, it falls back to the value of DEFAULT_MILL_VERSION
#
# Project page: https://github.com/lefou/millw
# Script Version: 0.4.2
#
# If you want to improve this script, please also contribute your changes back!
#
# Licensed under the Apache License, Version 2.0


DEFAULT_MILL_VERSION=0.10.0

set -e

MILL_REPO_URL="https://github.com/com-lihaoyi/mill"

if [ -z "${CURL_CMD}" ] ; then
CURL_CMD=curl
fi

# Explicit commandline argument takes precedence over all other methods
if [ "$1" = "--mill-version" ] ; then
shift
if [ "x$1" != "x" ] ; then
MILL_VERSION="$1"
shift
else
echo "You specified --mill-version without a version." 1>&2
echo "Please provide a version that matches one provided on" 1>&2
echo "${MILL_REPO_URL}/releases" 1>&2
false
fi
fi

# Please note, that if a MILL_VERSION is already set in the environment,
# We reuse it's value and skip searching for a value.

# If not already set, read .mill-version file
if [ -z "${MILL_VERSION}" ] ; then
if [ -f ".mill-version" ] ; then
MILL_VERSION="$(head -n 1 .mill-version 2> /dev/null)"
fi
fi

if [ -n "${XDG_CACHE_HOME}" ] ; then
MILL_DOWNLOAD_PATH="${XDG_CACHE_HOME}/mill/download"
else
MILL_DOWNLOAD_PATH="${HOME}/.cache/mill/download"
fi

# If not already set, try to fetch newest from Github
if [ -z "${MILL_VERSION}" ] ; then
# TODO: try to load latest version from release page
echo "No mill version specified." 1>&2
echo "You should provide a version via '.mill-version' file or --mill-version option." 1>&2

mkdir -p "${MILL_DOWNLOAD_PATH}"
LANG=C touch -d '1 hour ago' "${MILL_DOWNLOAD_PATH}/.expire_latest" 2>/dev/null || (
# we might be on OSX or BSD which don't have -d option for touch
# but probably a -A [-][[hh]mm]SS
touch "${MILL_DOWNLOAD_PATH}/.expire_latest"; touch -A -010000 "${MILL_DOWNLOAD_PATH}/.expire_latest"
) || (
# in case we still failed, we retry the first touch command with the intention
# to show the (previously suppressed) error message
LANG=C touch -d '1 hour ago' "${MILL_DOWNLOAD_PATH}/.expire_latest"
)

# POSIX shell variant of bash's -nt operator, see https://unix.stackexchange.com/a/449744/6993
# if [ "${MILL_DOWNLOAD_PATH}/.latest" -nt "${MILL_DOWNLOAD_PATH}/.expire_latest" ] ; then
if [ -n "$(find -L "${MILL_DOWNLOAD_PATH}/.latest" -prune -newer "${MILL_DOWNLOAD_PATH}/.expire_latest")" ]; then
# we know a current latest version
MILL_VERSION=$(head -n 1 "${MILL_DOWNLOAD_PATH}"/.latest 2> /dev/null)
fi

if [ -z "${MILL_VERSION}" ] ; then
# we don't know a current latest version
echo "Retrieving latest mill version ..." 1>&2
LANG=C ${CURL_CMD} -s -i -f -I ${MILL_REPO_URL}/releases/latest 2> /dev/null | grep --ignore-case Location: | sed s'/^.*tag\///' | tr -d '\r\n' > "${MILL_DOWNLOAD_PATH}/.latest"
MILL_VERSION=$(head -n 1 "${MILL_DOWNLOAD_PATH}"/.latest 2> /dev/null)
fi

if [ -z "${MILL_VERSION}" ] ; then
# Last resort
MILL_VERSION="${DEFAULT_MILL_VERSION}"
echo "Falling back to hardcoded mill version ${MILL_VERSION}" 1>&2
else
echo "Using mill version ${MILL_VERSION}" 1>&2
fi
fi

MILL="${MILL_DOWNLOAD_PATH}/${MILL_VERSION}"

try_to_use_system_mill() {
MILL_IN_PATH="$(command -v mill || true)"

if [ -z "${MILL_IN_PATH}" ]; then
return
fi

UNIVERSAL_SCRIPT_MAGIC="@ 2>/dev/null # 2>nul & echo off & goto BOF"

if ! head -c 128 "${MILL_IN_PATH}" | grep -qF "${UNIVERSAL_SCRIPT_MAGIC}"; then
if [ -n "${MILLW_VERBOSE}" ]; then
echo "Could not determine mill version of ${MILL_IN_PATH}, as it does not start with the universal script magic2" 1>&2
fi
return
fi

# Roughly the size of the universal script.
MILL_VERSION_SEARCH_RANGE="2403"
MILL_IN_PATH_VERSION=$(head -c "${MILL_VERSION_SEARCH_RANGE}" "${MILL_IN_PATH}" |\
sed -n 's/^.*-DMILL_VERSION=\([^\s]*\) .*$/\1/p' |\
head -n 1)

if [ -z "${MILL_IN_PATH_VERSION}" ]; then
echo "Could not determine mill version, even though ${MILL_IN_PATH} has the universal script magic" 1>&2
return
fi

if [ "${MILL_IN_PATH_VERSION}" = "${MILL_VERSION}" ]; then
MILL="${MILL_IN_PATH}"
fi
}
try_to_use_system_mill

# If not already downloaded, download it
if [ ! -s "${MILL}" ] ; then

# support old non-XDG download dir
MILL_OLD_DOWNLOAD_PATH="${HOME}/.mill/download"
OLD_MILL="${MILL_OLD_DOWNLOAD_PATH}/${MILL_VERSION}"
if [ -x "${OLD_MILL}" ] ; then
MILL="${OLD_MILL}"
else
VERSION_PREFIX="$(echo $MILL_VERSION | cut -b -4)"
case $VERSION_PREFIX in
0.0. | 0.1. | 0.2. | 0.3. | 0.4. )
DOWNLOAD_SUFFIX=""
;;
*)
DOWNLOAD_SUFFIX="-assembly"
;;
esac
unset VERSION_PREFIX

DOWNLOAD_FILE=$(mktemp mill.XXXXXX)
# TODO: handle command not found
echo "Downloading mill ${MILL_VERSION} from ${MILL_REPO_URL}/releases ..." 1>&2
MILL_VERSION_TAG=$(echo $MILL_VERSION | sed -E 's/([^-]+)(-M[0-9]+)?(-.*)?/\1\2/')
${CURL_CMD} -f -L -o "${DOWNLOAD_FILE}" "${MILL_REPO_URL}/releases/download/${MILL_VERSION_TAG}/${MILL_VERSION}${DOWNLOAD_SUFFIX}"
chmod +x "${DOWNLOAD_FILE}"
mkdir -p "${MILL_DOWNLOAD_PATH}"
mv "${DOWNLOAD_FILE}" "${MILL}"

unset DOWNLOAD_FILE
unset DOWNLOAD_SUFFIX
fi
fi

unset MILL_DOWNLOAD_PATH
unset MILL_OLD_DOWNLOAD_PATH
unset OLD_MILL
unset MILL_VERSION
unset MILL_VERSION_TAG
unset MILL_REPO_URL

exec "${MILL}" "$@"
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,16 @@ abstract class BaseBuildToolSuite extends MopedSuite(ScipJava.app) {
extraArguments: List[String] = Nil,
expectedError: Option[String => Unit] = None,
expectedPackages: String = "",
initCommand: => List[String] = Nil
initCommand: => List[String] = Nil,
targetRoot: Option[String] = None
): Unit = {
test(options.withTags(options.tags ++ tags)) {
if (initCommand.nonEmpty) {
os.proc(Shellable(initCommand)).call(os.Path(workingDirectory))
}
FileLayout.fromString(original, root = workingDirectory)
val targetroot = workingDirectory.resolve("targetroot")
val targetroot = workingDirectory
.resolve(targetRoot.getOrElse("targetroot"))
val arguments =
List[String](
"index",
Expand Down
Loading