diff --git a/.github/workflows/ci_test_and_publish.yml b/.github/workflows/ci_test_and_publish.yml
index 40e6c44e..2f7644da 100644
--- a/.github/workflows/ci_test_and_publish.yml
+++ b/.github/workflows/ci_test_and_publish.yml
@@ -23,7 +23,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: '11'
+ java-version: '17'
- name: Upload Artifacts
run: ./gradlew publishAllPublicationsToMavenCentralRepository --no-daemon --no-parallel
@@ -60,7 +60,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: '11'
+ java-version: '17'
- name: Run tests
uses: reactivecircus/android-emulator-runner@v2
with:
diff --git a/.github/workflows/sample_app.yml b/.github/workflows/sample_app.yml
index 8d031745..d2bb0a4d 100644
--- a/.github/workflows/sample_app.yml
+++ b/.github/workflows/sample_app.yml
@@ -20,7 +20,7 @@ jobs:
uses: actions/setup-java@v3
with:
distribution: 'zulu'
- java-version: '11'
+ java-version: '17'
- name: Build sample
run: |
./gradlew :affectedmoduledetector:publishToMavenLocal
diff --git a/affectedmoduledetector/build.gradle b/affectedmoduledetector/build.gradle
index dcf16e72..d57ace84 100644
--- a/affectedmoduledetector/build.gradle
+++ b/affectedmoduledetector/build.gradle
@@ -9,12 +9,16 @@ plugins {
apply from: rootProject.file("gradle/jacoco.gradle")
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+}
+
+kotlin {
+ jvmToolchain(11)
}
jacoco {
- toolVersion = "0.8.8"
+ toolVersion = "0.8.10"
}
gradlePlugin {
diff --git a/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt b/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
index 27258aa1..1c9dd6a4 100644
--- a/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
+++ b/affectedmoduledetector/src/main/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorPlugin.kt
@@ -8,8 +8,8 @@ import org.gradle.api.Plugin
import org.gradle.api.Project
import org.gradle.api.Task
import org.gradle.api.tasks.testing.Test
-import org.gradle.internal.impldep.org.jetbrains.annotations.VisibleForTesting
import org.gradle.util.GradleVersion
+import org.jetbrains.annotations.VisibleForTesting
/**
* This plugin creates and registers all affected test tasks.
diff --git a/affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt b/affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt
index eb83d89f..4eec50c7 100644
--- a/affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt
+++ b/affectedmoduledetector/src/test/kotlin/com/dropbox/affectedmoduledetector/AffectedModuleDetectorIntegrationTest.kt
@@ -60,8 +60,8 @@ class AffectedModuleDetectorIntegrationTest {
| jcenter()
| }
| dependencies {
- | classpath "com.android.tools.build:gradle:4.1.0"
- | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+ | classpath "com.android.tools.build:gradle:7.4.0"
+ | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
| }
|}
|plugins {
@@ -81,14 +81,22 @@ class AffectedModuleDetectorIntegrationTest {
| id 'kotlin-android'
| }
| android {
- | compileSdkVersion 30
- | buildToolsVersion "30.0.2"
+ | compileSdkVersion 33
+ | namespace "sample"
| }
| dependencies {
| implementation project(":sample-core")
| }""".trimMargin()
)
+ tmpFolder.newFolder("sample-app/src/main/")
+ tmpFolder.newFile("sample-app/src/main/AndroidManifest.xml").writeText(
+ """
+ |
+ |
+ """.trimMargin()
+ )
+
tmpFolder.newFile("sample-core/build.gradle").writeText(
"""plugins {
| id 'com.android.library'
@@ -98,11 +106,19 @@ class AffectedModuleDetectorIntegrationTest {
| assembleAndroidTestTask = "assembleAndroidTest"
| }
| android {
- | compileSdkVersion 30
- | buildToolsVersion "30.0.2"
+ | namespace 'sample.core'
+ | compileSdkVersion 33
| }""".trimMargin()
)
+ tmpFolder.newFolder("sample-core/src/main/")
+ tmpFolder.newFile("sample-core/src/main/AndroidManifest.xml").writeText(
+ """
+ |
+ |
+ """.trimMargin()
+ )
+
// WHEN
val result = GradleRunner.create()
.withProjectDir(tmpFolder.root)
@@ -138,8 +154,8 @@ class AffectedModuleDetectorIntegrationTest {
| jcenter()
| }
| dependencies {
- | classpath "com.android.tools.build:gradle:4.1.0"
- | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
+ | classpath "com.android.tools.build:gradle:7.4.0"
+ | classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25"
| }
|}
|plugins {
@@ -162,14 +178,22 @@ class AffectedModuleDetectorIntegrationTest {
| id 'kotlin-android'
| }
| android {
- | compileSdkVersion 30
- | buildToolsVersion "30.0.2"
+ | namespace 'sample'
+ | compileSdkVersion 33
| }
| dependencies {
| implementation project(":sample-core")
| }""".trimMargin()
)
+ tmpFolder.newFolder("sample-app/src/main/")
+ tmpFolder.newFile("sample-app/src/main/AndroidManifest.xml").writeText(
+ """
+ |
+ |
+ """.trimMargin()
+ )
+
tmpFolder.newFile("sample-core/build.gradle").writeText(
"""plugins {
| id 'com.android.library'
@@ -179,11 +203,19 @@ class AffectedModuleDetectorIntegrationTest {
| assembleAndroidTestTask = "assembleAndroidTest"
| }
| android {
- | compileSdkVersion 30
- | buildToolsVersion "30.0.2"
+ | namespace 'sample.core'
+ | compileSdkVersion 33
| }""".trimMargin()
)
+ tmpFolder.newFolder("sample-core/src/main/")
+ tmpFolder.newFile("sample-core/src/main/AndroidManifest.xml").writeText(
+ """
+ |
+ |
+ """.trimMargin()
+ )
+
// WHEN
val result = GradleRunner.create()
.withProjectDir(tmpFolder.root)
diff --git a/build.gradle b/build.gradle
index 720f0ac1..67da9786 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,6 +1,6 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
- ext.kotlin_version = "1.6.20"
+ ext.kotlin_version = "1.9.25"
repositories {
google()
mavenCentral()
@@ -9,10 +9,10 @@ buildscript {
}
}
dependencies {
- classpath "com.android.tools.build:gradle:7.3.1"
+ classpath "com.android.tools.build:gradle:8.6.1"
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
- classpath("org.jlleitschuh.gradle:ktlint-gradle:10.2.1")
- classpath("org.jacoco:org.jacoco.core:0.8.8")
+ classpath("org.jlleitschuh.gradle:ktlint-gradle:11.4.2")
+ classpath("org.jacoco:org.jacoco.core:0.8.10")
classpath "com.vanniktech:gradle-maven-publish-plugin:0.19.0"
}
}
diff --git a/gradle.properties b/gradle.properties
index a3d8c48e..43f12849 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -22,7 +22,7 @@ kotlin.code.style=official
# POM
GROUP = com.dropbox.affectedmoduledetector
-VERSION_NAME=0.3.2-SNAPSHOT
+VERSION_NAME=0.4.0-SNAPSHOT
POM_ARTIFACT_ID = affectedmoduledetector
POM_NAME = Affected Module Detector
diff --git a/gradle/jacoco.gradle b/gradle/jacoco.gradle
index b00ad7cd..c2375113 100644
--- a/gradle/jacoco.gradle
+++ b/gradle/jacoco.gradle
@@ -47,9 +47,9 @@ project.afterEvaluate {
executionData.setFrom files(coverageData)
reports {
- xml.enabled = true
+ xml.required = true
xml.destination = file("${buildDir}/reports/jacoco/report.xml")
- html.enabled = true
+ html.required = true
}
}
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index f6b961fd..41d9927a 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b61ec111..19cfad96 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Oct 15 15:49:37 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
diff --git a/gradlew b/gradlew
index cccdd3d5..1b6c7873 100755
--- a/gradlew
+++ b/gradlew
@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# Copyright © 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
##############################################################################
-##
-## Gradle start up script for UN*X
-##
+#
+# Gradle start up script for POSIX generated by Gradle.
+#
+# Important for running:
+#
+# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+# noncompliant, but you have some other compliant shell such as ksh or
+# bash, then to run this script, type that shell name before the whole
+# command line, like:
+#
+# ksh Gradle
+#
+# Busybox and similar reduced shells will NOT work, because this script
+# requires all of these POSIX shell features:
+# * functions;
+# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+# * compound commands having a testable exit status, especially «case»;
+# * various built-in commands including «command», «set», and «ulimit».
+#
+# Important for patching:
+#
+# (2) This script targets any POSIX shell, so it avoids extensions provided
+# by Bash, Ksh, etc; in particular arrays are avoided.
+#
+# The "traditional" practice of packing multiple parameters into a
+# space-separated string is a well documented source of bugs and security
+# problems, so this is (mostly) avoided, by progressively accumulating
+# options in "$@", and eventually passing that to Java.
+#
+# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+# see the in-line comments for details.
+#
+# There are tweaks for specific operating systems such as AIX, CygWin,
+# Darwin, MinGW, and NonStop.
+#
+# (3) This script is generated from the Groovy template
+# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+# within the Gradle project.
+#
+# You can find Gradle at https://github.com/gradle/gradle/.
+#
##############################################################################
# Attempt to set APP_HOME
+
# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
- ls=`ls -ld "$PRG"`
- link=`expr "$ls" : '.*-> \(.*\)$'`
- if expr "$link" : '/.*' > /dev/null; then
- PRG="$link"
- else
- PRG=`dirname "$PRG"`"/$link"
- fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+ APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
+ [ -h "$app_path" ]
+do
+ ls=$( ls -ld "$app_path" )
+ link=${ls#*' -> '}
+ case $link in #(
+ /*) app_path=$link ;; #(
+ *) app_path=$APP_HOME$link ;;
+ esac
done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
warn () {
echo "$*"
-}
+} >&2
die () {
echo
echo "$*"
echo
exit 1
-}
+} >&2
# OS specific support (must be 'true' or 'false').
cygwin=false
msys=false
darwin=false
nonstop=false
-case "`uname`" in
- CYGWIN* )
- cygwin=true
- ;;
- Darwin* )
- darwin=true
- ;;
- MINGW* )
- msys=true
- ;;
- NONSTOP* )
- nonstop=true
- ;;
+case "$( uname )" in #(
+ CYGWIN* ) cygwin=true ;; #(
+ Darwin* ) darwin=true ;; #(
+ MSYS* | MINGW* ) msys=true ;; #(
+ NONSTOP* ) nonstop=true ;;
esac
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
# Determine the Java command to use to start the JVM.
if [ -n "$JAVA_HOME" ] ; then
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
# IBM's JDK on AIX uses strange locations for the executables
- JAVACMD="$JAVA_HOME/jre/sh/java"
+ JAVACMD=$JAVA_HOME/jre/sh/java
else
- JAVACMD="$JAVA_HOME/bin/java"
+ JAVACMD=$JAVA_HOME/bin/java
fi
if [ ! -x "$JAVACMD" ] ; then
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
location of your Java installation."
fi
else
- JAVACMD="java"
+ JAVACMD=java
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
fi
# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
- MAX_FD_LIMIT=`ulimit -H -n`
- if [ $? -eq 0 ] ; then
- if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
- MAX_FD="$MAX_FD_LIMIT"
- fi
- ulimit -n $MAX_FD
- if [ $? -ne 0 ] ; then
- warn "Could not set maximum file descriptor limit: $MAX_FD"
- fi
- else
- warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
- fi
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+ case $MAX_FD in #(
+ max*)
+ MAX_FD=$( ulimit -H -n ) ||
+ warn "Could not query maximum file descriptor limit"
+ esac
+ case $MAX_FD in #(
+ '' | soft) :;; #(
+ *)
+ ulimit -n "$MAX_FD" ||
+ warn "Could not set maximum file descriptor limit to $MAX_FD"
+ esac
fi
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
- GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+# * args from the command line
+# * the main class name
+# * -classpath
+# * -D...appname settings
+# * --module-path (only if needed)
+# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
+
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+ APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+ CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+ JAVACMD=$( cygpath --unix "$JAVACMD" )
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
- APP_HOME=`cygpath --path --mixed "$APP_HOME"`
- CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
- JAVACMD=`cygpath --unix "$JAVACMD"`
-
- # We build the pattern for arguments to be converted via cygpath
- ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
- SEP=""
- for dir in $ROOTDIRSRAW ; do
- ROOTDIRS="$ROOTDIRS$SEP$dir"
- SEP="|"
- done
- OURCYGPATTERN="(^($ROOTDIRS))"
- # Add a user-defined pattern to the cygpath arguments
- if [ "$GRADLE_CYGPATTERN" != "" ] ; then
- OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
- fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
- i=0
- for arg in "$@" ; do
- CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
- CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
-
- if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
- eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
- else
- eval `echo args$i`="\"$arg\""
+ for arg do
+ if
+ case $arg in #(
+ -*) false ;; # don't mess with options #(
+ /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
+ [ -e "$t" ] ;; #(
+ *) false ;;
+ esac
+ then
+ arg=$( cygpath --path --ignore --mixed "$arg" )
fi
- i=$((i+1))
+ # Roll the args list around exactly as many times as the number of
+ # args, so each arg winds up back in the position where it started, but
+ # possibly modified.
+ #
+ # NB: a `for` loop captures its iteration list before it begins, so
+ # changing the positional parameters here affects neither the number of
+ # iterations, nor the values presented in `arg`.
+ shift # remove old arg
+ set -- "$@" "$arg" # push replacement arg
done
- case $i in
- (0) set -- ;;
- (1) set -- "$args0" ;;
- (2) set -- "$args0" "$args1" ;;
- (3) set -- "$args0" "$args1" "$args2" ;;
- (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
- (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
- (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
- (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
- (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
- (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
- esac
fi
-# Escape application args
-save () {
- for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
- echo " "
-}
-APP_ARGS=$(save "$@")
-
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
-
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
- cd "$(dirname "$0")"
-fi
+# Collect all arguments for the java command;
+# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+# shell script including quotes and variable substitutions, so put them in
+# double quotes to make sure that they get re-expanded; and
+# * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+ "-Dorg.gradle.appname=$APP_BASE_NAME" \
+ -classpath "$CLASSPATH" \
+ org.gradle.wrapper.GradleWrapperMain \
+ "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+# set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+ printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+ xargs -n1 |
+ sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+ tr '\n' ' '
+ )" '"$@"'
exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index e95643d6..ac1b06f9 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
@if "%DEBUG%" == "" @echo off
@rem ##########################################################################
@rem
@@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome
set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -35,7 +54,7 @@ goto fail
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -45,28 +64,14 @@ echo location of your Java installation.
goto fail
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
:execute
@rem Setup the command line
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
:end
@rem End local scope for the variables with windows NT shell
diff --git a/sample/buildSrc/build.gradle.kts b/sample/buildSrc/build.gradle.kts
index 6dbf47f2..38c28b42 100644
--- a/sample/buildSrc/build.gradle.kts
+++ b/sample/buildSrc/build.gradle.kts
@@ -2,7 +2,7 @@
* Copyright (c) 2020, Dropbox, Inc. All rights reserved.
*/
plugins {
- kotlin("jvm") version "1.6.10"
+ kotlin("jvm") version "1.9.25"
`java-gradle-plugin`
}
@@ -13,7 +13,7 @@ repositories {
}
dependencies {
- implementation("com.dropbox.affectedmoduledetector:affectedmoduledetector:0.3.2-SNAPSHOT")
+ implementation("com.dropbox.affectedmoduledetector:affectedmoduledetector:0.4.0-SNAPSHOT")
testImplementation("junit:junit:4.13.1")
testImplementation("com.nhaarman:mockito-kotlin:1.5.0")
testImplementation("com.google.truth:truth:1.0.1")
diff --git a/sample/buildSrc/src/main/kotlin/com/dropbox/sample/Dependencies.kt b/sample/buildSrc/src/main/kotlin/com/dropbox/sample/Dependencies.kt
index 5569b232..ea4550b8 100644
--- a/sample/buildSrc/src/main/kotlin/com/dropbox/sample/Dependencies.kt
+++ b/sample/buildSrc/src/main/kotlin/com/dropbox/sample/Dependencies.kt
@@ -3,7 +3,7 @@ package com.dropbox.sample
object Dependencies {
private object Versions {
- const val KOTLIN_VERSION = "1.6.10"
+ const val KOTLIN_VERSION = "1.9.25"
const val DETEKT_VERSION = "1.20.0"
}
@@ -17,7 +17,7 @@ object Dependencies {
const val JUNIT = "junit:junit:4.13.1"
const val ANDROIDX_TEST_EXT = "androidx.test.ext:junit:1.1.2"
const val ANDROIDX_ESPRESSO = "androidx.test.espresso:espresso-core:3.3.0"
- const val ANDROID_BUILD_TOOLS = "com.android.tools.build:gradle:4.1.0"
+ const val ANDROID_BUILD_TOOLS = "com.android.tools.build:gradle:8.6.1"
const val KTLINT = "org.jlleitschuh.gradle:ktlint-gradle:9.1.1"
const val DETEKT = "com.android.tools.build:gradle:${Versions.DETEKT_VERSION}"
const val DETEKT_PLUGIN = "io.gitlab.arturbosch.detekt"
diff --git a/sample/gradle/wrapper/gradle-wrapper.properties b/sample/gradle/wrapper/gradle-wrapper.properties
index 53450a8a..19cfad96 100644
--- a/sample/gradle/wrapper/gradle-wrapper.properties
+++ b/sample/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Thu Oct 15 15:49:37 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
diff --git a/sample/sample-app/build.gradle b/sample/sample-app/build.gradle
index a9d6cd70..3a516c78 100644
--- a/sample/sample-app/build.gradle
+++ b/sample/sample-app/build.gradle
@@ -11,13 +11,14 @@ affectedTestConfiguration {
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.2"
+ namespace "com.dropbox.detector.sample"
+
+ compileSdk 34
defaultConfig {
applicationId "com.dropbox.detector.sample"
minSdkVersion 23
- targetSdkVersion 30
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
@@ -31,11 +32,11 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = '11'
}
}
diff --git a/sample/sample-app/src/main/AndroidManifest.xml b/sample/sample-app/src/main/AndroidManifest.xml
index f3b679e7..c6dfd3a9 100644
--- a/sample/sample-app/src/main/AndroidManifest.xml
+++ b/sample/sample-app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
-
+
diff --git a/sample/sample-core/build.gradle b/sample/sample-core/build.gradle
index b724fe2c..b8107cfa 100644
--- a/sample/sample-core/build.gradle
+++ b/sample/sample-core/build.gradle
@@ -11,12 +11,13 @@ affectedTestConfiguration {
}
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.2"
+ namespace "com.dropbox.detector.sample_core"
+
+ compileSdk 34
defaultConfig {
minSdkVersion 23
- targetSdkVersion 30
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
@@ -31,11 +32,11 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = '11'
}
}
diff --git a/sample/sample-core/src/main/AndroidManifest.xml b/sample/sample-core/src/main/AndroidManifest.xml
index f8914ebe..dd03ca3d 100644
--- a/sample/sample-core/src/main/AndroidManifest.xml
+++ b/sample/sample-core/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
-
+
diff --git a/sample/sample-jvm-module/build.gradle.kts b/sample/sample-jvm-module/build.gradle.kts
index e8259cee..ebce4122 100644
--- a/sample/sample-jvm-module/build.gradle.kts
+++ b/sample/sample-jvm-module/build.gradle.kts
@@ -4,6 +4,10 @@ plugins {
}
java {
- sourceCompatibility = JavaVersion.VERSION_1_8
- targetCompatibility = JavaVersion.VERSION_1_8
+ sourceCompatibility = JavaVersion.VERSION_11
+ targetCompatibility = JavaVersion.VERSION_11
+}
+
+kotlin {
+ jvmToolchain(11)
}
\ No newline at end of file
diff --git a/sample/sample-util/build.gradle b/sample/sample-util/build.gradle
index 2264eea9..36469b4b 100644
--- a/sample/sample-util/build.gradle
+++ b/sample/sample-util/build.gradle
@@ -10,12 +10,12 @@ affectedTestConfiguration {
}
android {
- compileSdkVersion 30
- buildToolsVersion "30.0.2"
+ namespace "com.dropbox.detector.sample_util"
+ compileSdk 34
defaultConfig {
minSdkVersion 23
- targetSdkVersion 30
+ targetSdkVersion 34
versionCode 1
versionName "1.0"
@@ -30,11 +30,11 @@ android {
}
}
compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
+ sourceCompatibility JavaVersion.VERSION_11
+ targetCompatibility JavaVersion.VERSION_11
}
kotlinOptions {
- jvmTarget = '1.8'
+ jvmTarget = '11'
}
}
diff --git a/sample/sample-util/src/main/AndroidManifest.xml b/sample/sample-util/src/main/AndroidManifest.xml
index ed781795..44008a43 100644
--- a/sample/sample-util/src/main/AndroidManifest.xml
+++ b/sample/sample-util/src/main/AndroidManifest.xml
@@ -1,5 +1,4 @@
-
+
\ No newline at end of file