Merge pull request #341 from gradle/lptr/remove-file-events

Remove file-events subproject
gradle · Oct 15, 2024 · d8d0582 · d8d0582
2 parents 7341f10 + 6b34aec
commit d8d0582
Show file tree

Hide file tree

Showing 47 changed files with 5 additions and 6,471 deletions.
diff --git a/.teamcity/NativePlatformBuild.kt b/.teamcity/NativePlatformBuild.kt
@@ -33,7 +33,7 @@ open class NativePlatformBuild(agent: Agent, buildReceiptSource: Boolean = false
 
     steps {
         gradle {
-            tasks = "clean build -PagentName=${agent.name}${agent.extraTestTasks}${agent.allPublishTasks}"
+            tasks = "clean build -PagentName=${agent.name}${agent.allPublishTasks}"
             if (buildReceiptSource) {
                 gradleParams = "-PignoreIncomingBuildReceipt"
             }

diff --git a/.teamcity/NativePlatformCompatibilityTest.kt b/.teamcity/NativePlatformCompatibilityTest.kt
@@ -28,7 +28,7 @@ class NativePlatformCompatibilityTest(agent: Agent, buildDependencies: List<Buil
 
     steps {
         gradle {
-            tasks = "clean :native-platform:test :file-events:test -PtestVersionFromLocalRepository"
+            tasks = "clean :native-platform:test -PtestVersionFromLocalRepository"
             buildFile = ""
         }
     }

diff --git a/.teamcity/NativePlatformPublishing.kt b/.teamcity/NativePlatformPublishing.kt
@@ -135,7 +135,7 @@ class NativeLibraryPublishNcurses(releaseType: ReleaseType = ReleaseType.Snapsho
 class PublishJavaApi(releaseType: ReleaseType = ReleaseType.Snapshot, nativeLibraryPublishingBuilds: List<NativePlatformPublishSnapshot>, buildAndTest: List<BuildType>, buildReceiptSource: BuildType) :
     NativePlatformPublishSnapshot(
         releaseType,
-        listOf(":native-platform:uploadMain :file-events:uploadMain", ":test-app:uploadMain"),
+        listOf(":native-platform:uploadMain", ":test-app:uploadMain"),
         buildAndTest,
         buildReceiptSource,
         {

diff --git a/.teamcity/extensions.kt b/.teamcity/extensions.kt
@@ -44,7 +44,6 @@ const val buildReceipt = "build-receipt.properties"
 
 val archiveReports = listOf(
     "native-platform",
-    "file-events",
     "buildSrc",
     "test-app"
 ).joinToString("\n") { "$it/build/reports/** => $it/reports" }
@@ -71,45 +70,24 @@ val agentsForAllNativePlatformJniPublications = listOf(
     Agent.AmazonLinuxAarch64,
     Agent.FreeBsdAmd64
 )
-val agentsForAllFileEventsJniPublications = listOf(
-    Agent.UbuntuAmd64,
-    Agent.MacOsAmd64,
-    Agent.MacOsAarch64,
-    Agent.WindowsAmd64,
-    Agent.AmazonLinuxAarch64
-)
 val agentsForNcursesOnlyPublications = listOf(
     Agent.UbuntuAarch64,
     Agent.AmazonLinuxAmd64
 )
 
-val Agent.nativePlatformPublishJniTask
+val Agent.publishJniTasks
     get() = when (this) {
         in agentsForAllNativePlatformJniPublications -> " :native-platform:uploadJni"
         in agentsForNcursesOnlyPublications -> " :native-platform:uploadNcurses"
         else -> ""
     }
-val Agent.fileEventsPublishJniTask
-    get() = when (this) {
-        in agentsForAllFileEventsJniPublications -> " :file-events:uploadJni"
-        else -> ""
-    }
-
-val Agent.publishJniTasks
-    get() = nativePlatformPublishJniTask + fileEventsPublishJniTask
 
 val Agent.allPublishTasks
     get() = when (this) {
-        agentForJavaPublication -> "$publishJniTasks :native-platform:uploadMain :file-events:uploadMain"
+        agentForJavaPublication -> "$publishJniTasks :native-platform:uploadMain"
         else -> publishJniTasks
     }
 
-val Agent.extraTestTasks
-    get() = when (this) {
-        Agent.UbuntuAmd64 -> " :file-events:testBtrfs :file-events:testXfs"
-        else -> ""
-    }
-
 fun BuildFeatures.lowerRequiredFreeDiskSpace() {
     freeDiskSpace {
         // Configure less than the default 3GB, since the disk of the agents is only 5GB big.

diff --git a/file-events/build.gradle b/file-events/build.gradle