Skip to content

Commit a23d74d

Browse files
authored
Fixed configuration cache problem with deploy (#486)
* Fixed configuration cache problem during publication. It was caused by the explicit passing credentials. * Update Gradle version to 8.10.2
1 parent ab539b1 commit a23d74d

File tree

6 files changed

+16
-11
lines changed

6 files changed

+16
-11
lines changed

buildSrc/src/main/kotlin/base-publish-conventions.gradle.kts

+7-7
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ plugins {
66
publishing {
77
repositories {
88
maven {
9-
// TODO(Dmitrii Krasnov): add repository name, but before check
10-
// that TC build configuration does not set task names explicitly
9+
// if you change the name, you should change the name of the credential properties on CI as well
10+
name = "MavenRepositoryForPublishing"
11+
1112
url = mavenRepositoryUri()
12-
credentials {
13-
username = project.getSensitiveProperty("libs.sonatype.user")
14-
password = project.getSensitiveProperty("libs.sonatype.password")
15-
}
13+
14+
// we use such type of credential because of the configuration cache problems with other types:
15+
// https://github.com/gradle/gradle/issues/24040
16+
credentials(PasswordCredentials::class)
1617
}
1718
}
18-
1919
publications.withType<MavenPublication>().configureEach {
2020
pom {
2121
name = project.name

gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@ org.gradle.jvmargs=-Xmx2g -XX:MaxMetaspaceSize=2g
1818
org.gradle.caching=true
1919

2020
# Temporarily disabled, for details see: #483
21-
org.gradle.configuration-cache=false
21+
org.gradle.configuration-cache=true

gradle/wrapper/gradle-wrapper.jar

130 Bytes
Binary file not shown.

gradle/wrapper/gradle-wrapper.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
44
networkTimeout=10000
55
validateDistributionUrl=true
66
zipStoreBase=GRADLE_USER_HOME

gradlew

+5-2
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,8 @@ 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
90+
' "$PWD" ) || exit
8891

8992
# Use the maximum available, or set MAX_FD != -1 to use that value.
9093
MAX_FD=maximum

gradlew.bat

+2
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 ##########################################################################

0 commit comments

Comments
 (0)