feat: support Gradle version catalog (actions#394)

KengoTODA · web-flow · commit de1bb2b0c563 · 2022-10-17T18:34:41.000+02:00
diff --git a/README.md b/README.md
@@ -108,7 +108,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`
+- gradle: `**/*.gradle*`, `**/gradle-wrapper.properties`, `buildSrc/**/Versions.kt`, `buildSrc/**/Dependencies.kt`, and `gradle/*.versions.toml`
 - maven: `**/pom.xml`
 - sbt: all sbt build definition files `**/*.sbt`, `**/project/build.properties`, `**/project/**.{scala,sbt}`
 
diff --git a/__tests__/cache.test.ts b/__tests__/cache.test.ts
@@ -98,7 +98,7 @@ describe('dependency cache', () => {
         await expect(restore('gradle')).rejects.toThrowError(
           `No file in ${projectRoot(
             workspace
-          )} matched to [**/*.gradle*,**/gradle-wrapper.properties,buildSrc/**/Versions.kt,buildSrc/**/Dependencies.kt], make sure you have checked out the target repository`
+          )} matched to [**/*.gradle*,**/gradle-wrapper.properties,buildSrc/**/Versions.kt,buildSrc/**/Dependencies.kt,gradle/*.versions.toml], make sure you have checked out the target repository`
         );
       });
       it('downloads cache based on build.gradle', async () => {
@@ -112,6 +112,15 @@ describe('dependency cache', () => {
       it('downloads cache based on build.gradle.kts', async () => {
         createFile(join(workspace, 'build.gradle.kts'));
 
+        await restore('gradle');
+        expect(spyCacheRestore).toBeCalled();
+        expect(spyWarning).not.toBeCalled();
+        expect(spyInfo).toBeCalledWith('gradle cache is not found');
+      });
+      it('downloads cache based on libs.versions.toml', async () => {
+        createDirectory(join(workspace, 'gradle'));
+        createFile(join(workspace, 'gradle', 'libs.versions.toml'));
+
         await restore('gradle');
         expect(spyCacheRestore).toBeCalled();
         expect(spyWarning).not.toBeCalled();
diff --git a/dist/cleanup/index.js b/dist/cleanup/index.js
@@ -68224,7 +68224,8 @@ const supportedPackageManager = [
             '**/*.gradle*',
             '**/gradle-wrapper.properties',
             'buildSrc/**/Versions.kt',
-            'buildSrc/**/Dependencies.kt'
+            'buildSrc/**/Dependencies.kt',
+            'gradle/*.versions.toml'
         ]
     },
     {
diff --git a/dist/setup/index.js b/dist/setup/index.js
@@ -103427,7 +103427,8 @@ const supportedPackageManager = [
             '**/*.gradle*',
             '**/gradle-wrapper.properties',
             'buildSrc/**/Versions.kt',
-            'buildSrc/**/Dependencies.kt'
+            'buildSrc/**/Dependencies.kt',
+            'gradle/*.versions.toml'
         ]
     },
     {
diff --git a/src/cache.ts b/src/cache.ts
@@ -35,7 +35,8 @@ const supportedPackageManager: PackageManager[] = [
       '**/*.gradle*',
       '**/gradle-wrapper.properties',
       'buildSrc/**/Versions.kt',
-      'buildSrc/**/Dependencies.kt'
+      'buildSrc/**/Dependencies.kt',
+      'gradle/*.versions.toml'
     ]
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -68224,7 +68224,8 @@ const supportedPackageManager = [`
`68224`	`68224`	`'*/.gradle*',`
`68225`	`68225`	`'**/gradle-wrapper.properties',`
`68226`	`68226`	`'buildSrc/**/Versions.kt',`
`68227`		`- 'buildSrc/**/Dependencies.kt'`
	`68227`	`+ 'buildSrc/**/Dependencies.kt',`
	`68228`	`+ 'gradle/*.versions.toml'`
`68228`	`68229`	`]`
`68229`	`68230`	`},`
`68230`	`68231`	`{`
Original file line number	Diff line number	Diff line change
`@@ -103427,7 +103427,8 @@ const supportedPackageManager = [`
`103427`	`103427`	`'*/.gradle*',`
`103428`	`103428`	`'**/gradle-wrapper.properties',`
`103429`	`103429`	`'buildSrc/**/Versions.kt',`
`103430`		`- 'buildSrc/**/Dependencies.kt'`
	`103430`	`+ 'buildSrc/**/Dependencies.kt',`
	`103431`	`+ 'gradle/*.versions.toml'`
`103431`	`103432`	`]`
`103432`	`103433`	`},`
`103433`	`103434`	`{`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,8 @@ const supportedPackageManager: PackageManager[] = [`
`35`	`35`	`'*/.gradle*',`
`36`	`36`	`'**/gradle-wrapper.properties',`
`37`	`37`	`'buildSrc/**/Versions.kt',`
`38`		`- 'buildSrc/**/Dependencies.kt'`
	`38`	`+ 'buildSrc/**/Dependencies.kt',`
	`39`	`+ 'gradle/*.versions.toml'`
`39`	`40`	`]`
`40`	`41`	`},`
`41`	`42`	`{`