Skip to content

Commit 8ab89aa

Browse files
Merge pull request #365 from usefulness/suppress-java-24-warnings
Suppress Java 24 warnings
2 parents d448724 + bc367c1 commit 8ab89aa

File tree

4 files changed

+21
-12
lines changed

4 files changed

+21
-12
lines changed

gradle/wrapper/gradle-wrapper.jar

302 Bytes
Binary file not shown.

gradlew

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717
#
18+
# SPDX-License-Identifier: Apache-2.0
19+
#
1820

1921
##############################################################################
2022
#
@@ -55,7 +57,7 @@
5557
# Darwin, MinGW, and NonStop.
5658
#
5759
# (3) This script is generated from the Groovy template
58-
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
60+
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
5961
# within the Gradle project.
6062
#
6163
# You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
8486
# shellcheck disable=SC2034
8587
APP_BASE_NAME=${0##*/}
8688
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
87-
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
89+
APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
8890

8991
# Use the maximum available, or set MAX_FD != -1 to use that value.
9092
MAX_FD=maximum
@@ -112,7 +114,7 @@ case "$( uname )" in #(
112114
NONSTOP* ) nonstop=true ;;
113115
esac
114116

115-
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
117+
CLASSPATH="\\\"\\\""
116118

117119

118120
# Determine the Java command to use to start the JVM.
@@ -203,15 +205,15 @@ fi
203205
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
204206

205207
# Collect all arguments for the java command:
206-
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
208+
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
207209
# and any embedded shellness will be escaped.
208210
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
209211
# treated as '${Hostname}' itself on the command line.
210212

211213
set -- \
212214
"-Dorg.gradle.appname=$APP_BASE_NAME" \
213215
-classpath "$CLASSPATH" \
214-
org.gradle.wrapper.GradleWrapperMain \
216+
-jar "$APP_HOME/gradle/wrapper/gradle-wrapper.jar" \
215217
"$@"
216218

217219
# Stop when "xargs" is not available.

gradlew.bat

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
@rem See the License for the specific language governing permissions and
1414
@rem limitations under the License.
1515
@rem
16+
@rem SPDX-License-Identifier: Apache-2.0
17+
@rem
1618

1719
@if "%DEBUG%"=="" @echo off
1820
@rem ##########################################################################
@@ -68,11 +70,11 @@ goto fail
6870
:execute
6971
@rem Setup the command line
7072

71-
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
73+
set CLASSPATH=
7274

7375

7476
@rem Execute Gradle
75-
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
77+
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" -jar "%APP_HOME%\gradle\wrapper\gradle-wrapper.jar" %*
7678

7779
:end
7880
@rem End local scope for the variables with windows NT shell

ktlint-gradle-plugin/src/main/kotlin/io/github/usefulness/tasks/KtlintWorkTask.kt

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import io.github.usefulness.tasks.workers.ConsoleReportWorker
99
import io.github.usefulness.tasks.workers.GenerateReportsWorker
1010
import io.github.usefulness.tasks.workers.KtlintWorker
1111
import org.gradle.api.DefaultTask
12+
import org.gradle.api.JavaVersion
1213
import org.gradle.api.file.ConfigurableFileCollection
1314
import org.gradle.api.file.FileCollection
1415
import org.gradle.api.file.FileType
@@ -77,7 +78,11 @@ public abstract class KtlintWorkTask(
7778
@Suppress("ktlint:standard:value-argument-comment")
7879
@Input
7980
public val jvmArgs: ListProperty<String> = objectFactory.listProperty(
80-
default = listOf("--add-opens=java.base/java.lang=ALL-UNNAMED"), // https://youtrack.jetbrains.com/issue/KT-51619
81+
default = if (JavaVersion.current() >= JavaVersion.VERSION_24) {
82+
listOf("--sun-misc-unsafe-memory-access=allow") // // https://youtrack.jetbrains.com/issue/IJPL-191435
83+
} else {
84+
emptyList()
85+
},
8186
)
8287

8388
@Input
@@ -170,20 +175,20 @@ public abstract class KtlintWorkTask(
170175
}
171176
}
172177

173-
internal inline fun <reified T> ObjectFactory.property(default: T? = null): Property<T> = property(T::class.java).apply {
178+
internal inline fun <reified T : Any> ObjectFactory.property(default: T? = null): Property<T> = property(T::class.java).apply {
174179
convention(default)
175180
}
176181

177-
internal inline fun <reified T> ObjectFactory.property(default: Provider<T>): Property<T> = property(T::class.java).apply {
182+
internal inline fun <reified T : Any> ObjectFactory.property(default: Provider<T>): Property<T> = property(T::class.java).apply {
178183
convention(default)
179184
}
180185

181-
internal inline fun <reified T> ObjectFactory.listProperty(default: Iterable<T> = emptyList()): ListProperty<T> =
186+
internal inline fun <reified T : Any> ObjectFactory.listProperty(default: Iterable<T> = emptyList()): ListProperty<T> =
182187
listProperty(T::class.java).apply {
183188
convention(default)
184189
}
185190

186-
internal inline fun <reified K, reified V> ObjectFactory.mapProperty(default: Map<K, V> = emptyMap()): MapProperty<K, V> =
191+
internal inline fun <reified K : Any, reified V : Any> ObjectFactory.mapProperty(default: Map<K, V> = emptyMap()): MapProperty<K, V> =
187192
mapProperty(K::class.java, V::class.java).apply {
188193
convention(default)
189194
}

0 commit comments

Comments
 (0)