diff --git a/README.md b/README.md index ced59286..fa314ff7 100644 --- a/README.md +++ b/README.md @@ -114,7 +114,7 @@ Currently, the following distributions are supported: ### Caching packages dependencies The action has a built-in functionality for caching and restoring dependencies. It uses [actions/cache](https://github.com/actions/cache) under hood for caching dependencies but requires less configuration settings. Supported package managers are gradle, maven and sbt. The format of the used cache key is `setup-java-${{ platform }}-${{ packageManager }}-${{ fileHash }}`, where the hash is based on the following files: -- gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, and `gradle/*.versions.toml` +- gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, `gradle.properties` and `gradle/*.versions.toml` - maven: `**/pom.xml` - sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.scala`, `**/project/**.sbt` diff --git a/__tests__/cache.test.ts b/__tests__/cache.test.ts index ae568441..58b63400 100644 --- a/__tests__/cache.test.ts +++ b/__tests__/cache.test.ts @@ -102,7 +102,7 @@ describe('dependency cache', () => { await expect(restore('gradle')).rejects.toThrow( `No file in ${projectRoot( workspace - )} matched to [**/*.gradle*,**/gradle-wrapper.properties,buildSrc/**/Versions.kt,buildSrc/**/Dependencies.kt,gradle/*.versions.toml], make sure you have checked out the target repository` + )} matched to [**/*.gradle*,**/gradle-wrapper.properties,buildSrc/**/Versions.kt,buildSrc/**/Dependencies.kt,gradle/*.versions.toml,gradle.properties], make sure you have checked out the target repository` ); }); it('downloads cache based on build.gradle', async () => { @@ -130,6 +130,14 @@ describe('dependency cache', () => { expect(spyWarning).not.toHaveBeenCalled(); expect(spyInfo).toHaveBeenCalledWith('gradle cache is not found'); }); + it('downloads cache based on gradle.properties', async () => { + createFile(join(workspace, 'gradle.properties')); + + await restore('gradle'); + expect(spyCacheRestore).toBeCalled(); + expect(spyWarning).not.toBeCalled(); + expect(spyInfo).toBeCalledWith('gradle cache is not found'); + }); }); it('downloads cache based on buildSrc/Versions.kt', async () => { createDirectory(join(workspace, 'buildSrc')); diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js index d87b4fa1..c396e97b 100644 --- a/dist/cleanup/index.js +++ b/dist/cleanup/index.js @@ -66513,7 +66513,8 @@ const supportedPackageManager = [ '**/gradle-wrapper.properties', 'buildSrc/**/Versions.kt', 'buildSrc/**/Dependencies.kt', - 'gradle/*.versions.toml' + 'gradle/*.versions.toml', + 'gradle.properties' ] }, { diff --git a/dist/setup/index.js b/dist/setup/index.js index 66a0a3c5..31ced090 100644 --- a/dist/setup/index.js +++ b/dist/setup/index.js @@ -101718,7 +101718,8 @@ const supportedPackageManager = [ '**/gradle-wrapper.properties', 'buildSrc/**/Versions.kt', 'buildSrc/**/Dependencies.kt', - 'gradle/*.versions.toml' + 'gradle/*.versions.toml', + 'gradle.properties' ] }, { diff --git a/src/cache.ts b/src/cache.ts index 4d37664f..553c63ee 100644 --- a/src/cache.ts +++ b/src/cache.ts @@ -39,7 +39,8 @@ const supportedPackageManager: PackageManager[] = [ '**/gradle-wrapper.properties', 'buildSrc/**/Versions.kt', 'buildSrc/**/Dependencies.kt', - 'gradle/*.versions.toml' + 'gradle/*.versions.toml', + 'gradle.properties' ] }, {