Skip to content

Commit 15fd350

Browse files
committed
Cleanup various things
- Reduce visiblity - Delete unneeded test - @ignore test that can only pass with the secret - Start running check task
1 parent 64f22b4 commit 15fd350

File tree

8 files changed

+10
-47
lines changed

8 files changed

+10
-47
lines changed

.github/workflows/build.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@ jobs:
2121
- name: Setup Gradle
2222
uses: gradle/gradle-build-action@v2
2323
- name: Execute Gradle build
24-
run: ./gradlew jar functionalTest
24+
run: ./gradlew jar check

gcpbuildcache/src/functionalTest/kotlin/androidx/build/gradle/gcpbuildcache/GcpGradleBuildCachePluginFunctionalTest.kt

+3-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,8 @@ class GcpGradleBuildCachePluginFunctionalTest {
3535
private fun getBuildFile() = getProjectDir().resolve("build.gradle.kts")
3636
private fun getSettingsFile() = getProjectDir().resolve("settings.gradle.kts")
3737

38-
@Test fun `can run tasks task`() {
38+
@Test
39+
fun `can run tasks task`() {
3940
// Setup the test build
4041
getSettingsFile().writeText("""
4142
plugins {
@@ -56,6 +57,6 @@ class GcpGradleBuildCachePluginFunctionalTest {
5657
runner.withPluginClasspath()
5758
runner.withArguments("tasks")
5859
runner.withProjectDir(getProjectDir())
59-
val result = runner.build();
60+
runner.build();
6061
}
6162
}

gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/FileSystemStorageService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import java.nio.file.Files
2424
/**
2525
* An implementation of the [StorageService] that is backed by a file system.
2626
*/
27-
class FileSystemStorageService(
27+
internal class FileSystemStorageService(
2828
override val projectId: String,
2929
override val bucketName: String,
3030
override val isPush: Boolean

gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpBuildCacheService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import java.io.ByteArrayOutputStream
3131
* @param bucketName The name of the bucket that is used to store all the gradle cache entries.
3232
* This essentially becomes the root of all cache entries.
3333
*/
34-
class GcpBuildCacheService(
34+
internal class GcpBuildCacheService(
3535
private val projectId: String,
3636
private val bucketName: String,
3737
private val isPush: Boolean,

gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpBuildCacheServiceFactory.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ package androidx.build.gradle.gcpbuildcache
2020
import org.gradle.caching.BuildCacheService
2121
import org.gradle.caching.BuildCacheServiceFactory
2222

23-
class GcpBuildCacheServiceFactory : BuildCacheServiceFactory<GcpBuildCache> {
23+
internal class GcpBuildCacheServiceFactory : BuildCacheServiceFactory<GcpBuildCache> {
2424
override fun createBuildCacheService(
2525
buildCache: GcpBuildCache,
2626
describer: BuildCacheServiceFactory.Describer,

gcpbuildcache/src/main/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageService.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import java.nio.channels.Channels
3131
/**
3232
* An implementation of the [StorageService] that is backed by Google Cloud Storage.
3333
*/
34-
class GcpStorageService(
34+
internal class GcpStorageService(
3535
override val projectId: String,
3636
override val bucketName: String,
3737
override val isPush: Boolean

gcpbuildcache/src/test/kotlin/androidx/build/gradle/gcpbuildcache/GcpGradleBuildCachePluginTest.kt

-40
This file was deleted.

gcpbuildcache/src/test/kotlin/androidx/build/gradle/gcpbuildcache/GcpStorageServiceTest.kt

+2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@
1717

1818
package androidx.build.gradle.gcpbuildcache
1919

20+
import org.junit.Ignore
2021
import org.junit.Test
2122

23+
@Ignore // These can only run with GRADLE_CACHE_SERVICE_ACCOUNT_PATH set
2224
class GcpStorageServiceTest {
2325
@Test
2426
fun testStoreBlob() {

0 commit comments

Comments
 (0)