[repo] Update to Gradle 8.2.1 version
This Gradle release also fixes 2 security vulnerabilities: https://docs.gradle.org/8.2.1/release-notes.html
This commit is contained in:
committed by
Space Team
parent
f2816a5531
commit
ed8fc64257
@@ -5,11 +5,11 @@
|
|||||||
|
|
||||||
@file:JvmName("LibrariesCommon")
|
@file:JvmName("LibrariesCommon")
|
||||||
|
|
||||||
import gradle.kotlin.dsl.accessors._a448c82b4669f5dc55622c27b71461fb.base
|
|
||||||
import org.gradle.api.JavaVersion
|
import org.gradle.api.JavaVersion
|
||||||
import org.gradle.api.Project
|
import org.gradle.api.Project
|
||||||
import org.gradle.api.file.FileCollection
|
import org.gradle.api.file.FileCollection
|
||||||
import org.gradle.api.java.archives.Manifest
|
import org.gradle.api.java.archives.Manifest
|
||||||
|
import org.gradle.api.plugins.BasePluginExtension
|
||||||
import org.gradle.api.tasks.compile.JavaCompile
|
import org.gradle.api.tasks.compile.JavaCompile
|
||||||
import org.gradle.kotlin.dsl.*
|
import org.gradle.kotlin.dsl.*
|
||||||
import org.gradle.process.CommandLineArgumentProvider
|
import org.gradle.process.CommandLineArgumentProvider
|
||||||
@@ -90,7 +90,7 @@ fun Project.manifestAttributes(
|
|||||||
) {
|
) {
|
||||||
manifest.attributes(
|
manifest.attributes(
|
||||||
"Implementation-Vendor" to "JetBrains",
|
"Implementation-Vendor" to "JetBrains",
|
||||||
"Implementation-Title" to base.archivesName,
|
"Implementation-Title" to project.extensions.getByType<BasePluginExtension>().archivesName,
|
||||||
"Implementation-Version" to project.rootProject.extra["buildNumber"] as String
|
"Implementation-Version" to project.rootProject.extra["buildNumber"] as String
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ dependencies {
|
|||||||
configurations.all {
|
configurations.all {
|
||||||
if (isCanBeResolved && !isCanBeConsumed) {
|
if (isCanBeResolved && !isCanBeConsumed) {
|
||||||
allDependencies.configureEach {
|
allDependencies.configureEach {
|
||||||
if (group == "com.google.code.gson" && name == "gson" && (this as? DeprecatableConfiguration)?.isCanBeDeclaredAgainst == true) { // isCanBeDeclaredAgainst will be a part of the public API since 8.2 https://github.com/gradle/gradle/pull/24823
|
if (group == "com.google.code.gson" && name == "gson" && this@all.isCanBeDeclared) {
|
||||||
this@constraints.add(this@all.name, "com.google.code.gson:gson") {
|
this@constraints.add(this@all.name, "com.google.code.gson:gson") {
|
||||||
version {
|
version {
|
||||||
require(gsonVersion)
|
require(gsonVersion)
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-embeddable" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-embeddable" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-annotation-processing-gradle" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-assignment" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-assignment" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
|
<trust group="org.jetbrains.kotlin" name="kotlin-assignment-compiler-plugin-embeddable" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-build-tools-api" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
<trust group="org.jetbrains.kotlin" name="kotlin-build-tools-enum-compat" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
<trust group="org.jetbrains.kotlin" name="kotlin-build-tools-enum-compat" version="1.9.2?[0-9](-.+)?" regex="true"/>
|
||||||
@@ -7277,6 +7278,12 @@
|
|||||||
<sha256 value="24d7f385cdffff81648f11098688fd0a2f1986c5286364183c08958927e5307d" origin="Generated by Gradle"/>
|
<sha256 value="24d7f385cdffff81648f11098688fd0a2f1986c5286364183c08958927e5307d" origin="Generated by Gradle"/>
|
||||||
</artifact>
|
</artifact>
|
||||||
</component>
|
</component>
|
||||||
|
<component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.0.14">
|
||||||
|
<artifact name="gradle-kotlin-dsl-plugins-4.0.14.jar">
|
||||||
|
<md5 value="98f2e2c415ae1ae8a5d0a6ae9f54edc5" origin="Generated by Gradle"/>
|
||||||
|
<sha256 value="8bde305e1b349f7d1fa3d2a9e6fba8fda08571306b70bc9858464db15e6bbce7" origin="Generated by Gradle"/>
|
||||||
|
</artifact>
|
||||||
|
</component>
|
||||||
<component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.0.7">
|
<component group="org.gradle.kotlin" name="gradle-kotlin-dsl-plugins" version="4.0.7">
|
||||||
<artifact name="gradle-kotlin-dsl-plugins-4.0.7.jar">
|
<artifact name="gradle-kotlin-dsl-plugins-4.0.7.jar">
|
||||||
<md5 value="7f73b1970da5906bb57c2d4e95afb8ad" origin="Generated by Gradle"/>
|
<md5 value="7f73b1970da5906bb57c2d4e95afb8ad" origin="Generated by Gradle"/>
|
||||||
@@ -7617,6 +7624,12 @@
|
|||||||
<sha256 value="e270b8f0652d979a63aca4d4a21270986aaf06378e2eb838f00ce09390f5ab4c" origin="Generated by Gradle"/>
|
<sha256 value="e270b8f0652d979a63aca4d4a21270986aaf06378e2eb838f00ce09390f5ab4c" origin="Generated by Gradle"/>
|
||||||
</artifact>
|
</artifact>
|
||||||
</component>
|
</component>
|
||||||
|
<component group="org.jetbrains.kotlin" name="kotlin-assignment-compiler-plugin-embeddable" version="1.9.20-dev-4459">
|
||||||
|
<artifact name="kotlin-assignment-compiler-plugin-embeddable-1.9.20-dev-4459.jar">
|
||||||
|
<md5 value="7aef7b9a8a29dc5aea48fa396c060ae1" origin="Generated by Gradle"/>
|
||||||
|
<sha256 value="afecd12750f76028639fcbfbc1ede4c4adc3a65ad2b87eb9dfb5905cdca695a8" origin="Generated by Gradle"/>
|
||||||
|
</artifact>
|
||||||
|
</component>
|
||||||
<component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.5.31">
|
<component group="org.jetbrains.kotlin" name="kotlin-build-common" version="1.5.31">
|
||||||
<artifact name="kotlin-build-common-1.5.31.jar">
|
<artifact name="kotlin-build-common-1.5.31.jar">
|
||||||
<md5 value="5e95bbaa4df2da6899175abac0a8306a" origin="Generated by Gradle"/>
|
<md5 value="5e95bbaa4df2da6899175abac0a8306a" origin="Generated by Gradle"/>
|
||||||
|
|||||||
Vendored
BIN
Binary file not shown.
+3
-2
@@ -1,7 +1,8 @@
|
|||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionSha256Sum=e111cb9948407e26351227dabce49822fb88c37ee72f1d1582a69c68af2e702f
|
distributionSha256Sum=03ec176d388f2aa99defcadc3ac6adf8dd2bce5145a129659537c0874dea5ad1
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.2.1-bin.zip
|
||||||
networkTimeout=10000
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
@@ -130,10 +130,13 @@ location of your Java installation."
|
|||||||
fi
|
fi
|
||||||
else
|
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.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
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
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
|
|||||||
+1
@@ -25,6 +25,7 @@ fun buildIdeaKotlinDependencyMatchers(notation: Any?): List<IdeaKotlinDependency
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, project: Project, sourceSetName: String): IdeaKotlinDependencyMatcher {
|
fun ideSourceDependency(type: IdeaKotlinSourceDependency.Type, project: Project, sourceSetName: String): IdeaKotlinDependencyMatcher {
|
||||||
|
@Suppress("DEPRECATION") // Should be fixed via https://youtrack.jetbrains.com/issue/KT-58157
|
||||||
return IdeaKotlinSourceDependencyMatcher(type, project.currentBuildId().name, project.path, sourceSetName)
|
return IdeaKotlinSourceDependencyMatcher(type, project.currentBuildId().name, project.path, sourceSetName)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+1
-1
@@ -12,7 +12,7 @@ import org.gradle.tooling.internal.adapter.ProtocolToModelAdapter
|
|||||||
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
* Use of this source code is governed by the Apache 2.0 license that can be found in the license/LICENSE.txt file.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
inline fun <reified T> createProxyInstance(obj: Any): T {
|
inline fun <reified T> createProxyInstance(obj: Any): T? {
|
||||||
return ProtocolToModelAdapter().adapt(T::class.java, obj)
|
return ProtocolToModelAdapter().adapt(T::class.java, obj)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user