Skip to content

Commit 2059401

Browse files
NikkyAINikkyAI
committed
fix idea sync on included builds
1 parent db74338 commit 2059401

File tree

27 files changed

+821
-1
lines changed

27 files changed

+821
-1
lines changed

‎.github/workflows/check-build.yml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,3 +52,8 @@ jobs:
5252
wrapper-directory: sample-multi-modules
5353
build-root-directory: sample-multi-modules
5454
arguments: check --stacktrace
55+
- uses: eskatos/gradle-command-action@v1
56+
with:
57+
wrapper-directory: sample-include-build
58+
build-root-directory: sample-include-build
59+
arguments: check --stacktrace

‎plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/RefreshVersionsCorePlugin.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,20 +4,22 @@ import de.fayard.refreshVersions.core.extensions.gradle.isBuildSrc
44
import de.fayard.refreshVersions.core.extensions.gradle.isRootProject
55
import de.fayard.refreshVersions.core.internal.InternalRefreshVersionsApi
66
import de.fayard.refreshVersions.core.internal.RefreshVersionsConfigHolder
7+
import de.fayard.refreshVersions.core.internal.ResettableDelegates
78
import org.gradle.api.Plugin
89
import org.gradle.api.Project
910
import org.gradle.kotlin.dsl.register
1011
import org.slf4j.Marker
1112
import org.slf4j.helpers.BasicMarkerFactory
13+
import java.lang.IllegalStateException
1214

1315
open class RefreshVersionsCorePlugin : Plugin<Project> {
1416

1517
override fun apply(project: Project) {
1618
check(project.isRootProject) { "ERROR: de.fayard.refreshVersions.core should not be applied manually" }
1719
if (project.isBuildSrc.not()) {
20+
val versionsFileName = RefreshVersionsConfigHolder.versionsPropertiesFile.name
1821
project.tasks.register<RefreshVersionsTask>(name = "refreshVersions") {
1922
group = "Help"
20-
val versionsFileName = RefreshVersionsConfigHolder.versionsPropertiesFile.name
2123
description = "Search for new dependencies versions and update $versionsFileName"
2224
}
2325
}

‎sample-include-build/build.gradle.kts

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
import de.fayard.refreshVersions.core.versionFor
2+
import org.jetbrains.kotlin.gradle.plugin.getKotlinPluginVersion
3+
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
4+
5+
buildscript {
6+
repositories {
7+
gradlePluginPortal()
8+
google()
9+
mavenCentral()
10+
}
11+
dependencies {
12+
classpath("org.gradle:gradle-hello-world-plugin:_")
13+
}
14+
}
15+
16+
plugins {
17+
kotlin("jvm")
18+
}
19+
20+
group = "de.fayard"
21+
22+
repositories {
23+
mavenLocal()
24+
mavenCentral()
25+
google()
26+
}
27+
28+
fun DependencyHandler.implementations(deps: List<String>) =
29+
deps.forEach { implementation(it) }
30+
31+
fun DependencyHandler.testImplementations(deps: List<String>) =
32+
deps.forEach { testImplementation(it) }
33+
34+
35+
dependencies {
36+
api("de.fayard:included")
37+
// api("de.fayard:subproject")
38+
// api("de.fayard:subproject2")
39+
40+
implementations(listOf(AndroidX.browser, AndroidX.cardView))
41+
implementation(AndroidX.core)
42+
implementation("com.google.guava:guava:15.0")
43+
implementation(kotlin("stdlib-jdk8"))
44+
implementation(kotlin("script-runtime"))
45+
46+
testImplementations(listOf(KotlinX.coroutines.core, KotlinX.coroutines.jdk8))
47+
testImplementation(Testing.kotest.assertions.core)
48+
testImplementation(platform(notation = "org.junit:junit-bom:_"))
49+
testImplementation("org.junit.jupiter:junit-jupiter")
50+
testRuntimeOnly("org.junit.platform:junit-platform-launcher") {
51+
because("allows tests to run from IDEs that bundle older version of launcher")
52+
}
53+
54+
api("org.apache.poi:poi:_")
55+
api("org.apache.poi:poi-ooxml:_")
56+
}
57+
58+
59+
getKotlinPluginVersion().let {
60+
val kotlinStdlibVersion = versionFor(dependencyNotation = Kotlin.stdlib)
61+
check(it == kotlinStdlibVersion) {
62+
"Unexpected mismatch between the version of the Kotlin plugin and the stdlib. " +
63+
"Is the versionFor function implementation correct?" +
64+
"Got respectively $it and $kotlinStdlibVersion"
65+
}
66+
val kotlinVersion = versionFor(versionKey = "version.kotlin")
67+
check(it == kotlinVersion) {
68+
"Unexpected mismatch between the version of the Kotlin plugin and the one from versions.properties. " +
69+
"Is the versionFor function implementation correct?" +
70+
"Got respectively $it and $kotlinStdlibVersion"
71+
}
72+
}
73+
74+
tasks.register("run", JavaExec::class.java) {
75+
this.main = "de.fayard.GuavaTest"
76+
}
77+
78+
tasks.withType<KotlinCompile> {
79+
kotlinOptions.jvmTarget = "1.8"
80+
}
81+
82+
tasks.withType<Test> {
83+
useJUnitPlatform()
84+
}
85+
86+
tasks.withType(JavaExec::class.java) {
87+
classpath = sourceSets["main"].runtimeClasspath
88+
}
89+
90+
tasks.register<DefaultTask>("hello") {
91+
group = "Custom"
92+
description = "Minimal task that do nothing. Useful to debug a failing build"
93+
}

‎sample-include-build/buildSrc/.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
.gradle/
2+
build/

‎sample-include-build/buildSrc/build.gradle.kts

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
plugins {
2+
`kotlin-dsl`
3+
}
4+
5+
repositories {
6+
mavenCentral()
7+
}
8+
9+
dependencies {
10+
compileOnly(gradleKotlinDsl())
11+
implementation(Square.okHttp3.okHttp)
12+
implementation(KotlinX.collections.immutable)
13+
}

‎sample-include-build/buildSrc/settings.gradle.kts

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
pluginManagement {
2+
repositories {
3+
mavenLocal()
4+
gradlePluginPortal()
5+
}
6+
7+
val versionFile = rootDir.parentFile.parentFile.resolve("plugins/version.txt")
8+
val pluginsVersion = versionFile.readLines().first()
9+
10+
@Suppress("UnstableApiUsage")
11+
plugins {
12+
id("de.fayard.refreshVersions").version(pluginsVersion)
13+
}
14+
}
15+
16+
plugins {
17+
id("de.fayard.refreshVersions")
18+
}

‎sample-include-build/gradle/wrapper/gradle-wrapper.jar

57.8 KB
Binary file not shown.

‎sample-include-build/gradle/wrapper/gradle-wrapper.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
distributionBase=GRADLE_USER_HOME
2+
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
4+
zipStoreBase=GRADLE_USER_HOME
5+
zipStorePath=wrapper/dists

‎sample-include-build/gradlew

Lines changed: 185 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,185 @@
1+
#!/usr/bin/env sh
2+
3+
#
4+
# Copyright 2015 the original author or authors.
5+
#
6+
# Licensed under the Apache License, Version 2.0 (the "License");
7+
# you may not use this file except in compliance with the License.
8+
# You may obtain a copy of the License at
9+
#
10+
# https://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing, software
13+
# distributed under the License is distributed on an "AS IS" BASIS,
14+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
15+
# See the License for the specific language governing permissions and
16+
# limitations under the License.
17+
#
18+
19+
##############################################################################
20+
##
21+
## Gradle start up script for UN*X
22+
##
23+
##############################################################################
24+
25+
# Attempt to set APP_HOME
26+
# Resolve links: $0 may be a link
27+
PRG="$0"
28+
# Need this for relative symlinks.
29+
while [ -h "$PRG" ] ; do
30+
ls=`ls -ld "$PRG"`
31+
link=`expr "$ls" : '.*-> \(.*\)$'`
32+
if expr "$link" : '/.*' > /dev/null; then
33+
PRG="$link"
34+
else
35+
PRG=`dirname "$PRG"`"/$link"
36+
fi
37+
done
38+
SAVED="`pwd`"
39+
cd "`dirname \"$PRG\"`/" >/dev/null
40+
APP_HOME="`pwd -P`"
41+
cd "$SAVED" >/dev/null
42+
43+
APP_NAME="Gradle"
44+
APP_BASE_NAME=`basename "$0"`
45+
46+
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
47+
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
48+
49+
# Use the maximum available, or set MAX_FD != -1 to use that value.
50+
MAX_FD="maximum"
51+
52+
warn () {
53+
echo "$*"
54+
}
55+
56+
die () {
57+
echo
58+
echo "$*"
59+
echo
60+
exit 1
61+
}
62+
63+
# OS specific support (must be 'true' or 'false').
64+
cygwin=false
65+
msys=false
66+
darwin=false
67+
nonstop=false
68+
case "`uname`" in
69+
CYGWIN* )
70+
cygwin=true
71+
;;
72+
Darwin* )
73+
darwin=true
74+
;;
75+
MINGW* )
76+
msys=true
77+
;;
78+
NONSTOP* )
79+
nonstop=true
80+
;;
81+
esac
82+
83+
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
84+
85+
86+
# Determine the Java command to use to start the JVM.
87+
if [ -n "$JAVA_HOME" ] ; then
88+
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
89+
# IBM's JDK on AIX uses strange locations for the executables
90+
JAVACMD="$JAVA_HOME/jre/sh/java"
91+
else
92+
JAVACMD="$JAVA_HOME/bin/java"
93+
fi
94+
if [ ! -x "$JAVACMD" ] ; then
95+
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
96+
97+
Please set the JAVA_HOME variable in your environment to match the
98+
location of your Java installation."
99+
fi
100+
else
101+
JAVACMD="java"
102+
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
103+
104+
Please set the JAVA_HOME variable in your environment to match the
105+
location of your Java installation."
106+
fi
107+
108+
# Increase the maximum file descriptors if we can.
109+
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
110+
MAX_FD_LIMIT=`ulimit -H -n`
111+
if [ $? -eq 0 ] ; then
112+
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
113+
MAX_FD="$MAX_FD_LIMIT"
114+
fi
115+
ulimit -n $MAX_FD
116+
if [ $? -ne 0 ] ; then
117+
warn "Could not set maximum file descriptor limit: $MAX_FD"
118+
fi
119+
else
120+
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
121+
fi
122+
fi
123+
124+
# For Darwin, add options to specify how the application appears in the dock
125+
if $darwin; then
126+
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
127+
fi
128+
129+
# For Cygwin or MSYS, switch paths to Windows format before running java
130+
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
131+
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
132+
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
133+
134+
JAVACMD=`cygpath --unix "$JAVACMD"`
135+
136+
# We build the pattern for arguments to be converted via cygpath
137+
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
138+
SEP=""
139+
for dir in $ROOTDIRSRAW ; do
140+
ROOTDIRS="$ROOTDIRS$SEP$dir"
141+
SEP="|"
142+
done
143+
OURCYGPATTERN="(^($ROOTDIRS))"
144+
# Add a user-defined pattern to the cygpath arguments
145+
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
146+
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
147+
fi
148+
# Now convert the arguments - kludge to limit ourselves to /bin/sh
149+
i=0
150+
for arg in "$@" ; do
151+
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
152+
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
153+
154+
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
155+
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
156+
else
157+
eval `echo args$i`="\"$arg\""
158+
fi
159+
i=`expr $i + 1`
160+
done
161+
case $i in
162+
0) set -- ;;
163+
1) set -- "$args0" ;;
164+
2) set -- "$args0" "$args1" ;;
165+
3) set -- "$args0" "$args1" "$args2" ;;
166+
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
167+
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
168+
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
169+
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
170+
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
171+
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
172+
esac
173+
fi
174+
175+
# Escape application args
176+
save () {
177+
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
178+
echo " "
179+
}
180+
APP_ARGS=`save "$@"`
181+
182+
# Collect all arguments for the java command, following the shell quoting and substitution rules
183+
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
184+
185+
exec "$JAVACMD" "$@"

0 commit comments

Comments
 (0)