Skip to content

Commit 6457e1b

Browse files
GooolerGoooler
committed
Rename mainClass to mainClassEntry
1 parent d48c3fa commit 6457e1b

File tree

6 files changed

+40
-40
lines changed

6 files changed

+40
-40
lines changed

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/ApplicationPluginTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ class ApplicationPluginTest : BasePluginTest() {
116116
)
117117
@Test
118118
fun canOverrideMainClassAttrInManifestBlock() {
119-
val main2Class = writeClass(className = "Main2")
119+
val main2ClassEntry = writeClass(className = "Main2")
120120
prepare(
121121
projectBlock = """
122122
shadowJar {
@@ -137,7 +137,7 @@ class ApplicationPluginTest : BasePluginTest() {
137137
assertions(run(runShadowTask).output, "foo")
138138
commonAssertions(
139139
jarPath("build/install/myapp-shadow/lib/myapp-1.0-all.jar"),
140-
entriesContained = entriesInA + arrayOf(mainClass, main2Class),
140+
entriesContained = entriesInA + arrayOf(mainClass, main2ClassEntry),
141141
mainClassAttr = "my.Main2",
142142
)
143143

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/JavaPluginTest.kt‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class JavaPluginTest : BasePluginTest() {
7171
disabledReason = "Gradle 8.3 doesn't support Java 21.",
7272
)
7373
fun compatibleWithMinGradleVersion() {
74-
val mainClass = writeClass(withImports = true)
74+
val mainClassEntry = writeClass(withImports = true)
7575
projectScriptPath.appendText(
7676
"""
7777
dependencies {
@@ -86,7 +86,7 @@ class JavaPluginTest : BasePluginTest() {
8686

8787
assertThat(outputShadowJar).useAll {
8888
containsEntries(
89-
mainClass,
89+
mainClassEntry,
9090
*junitEntries,
9191
)
9292
}
@@ -503,7 +503,7 @@ class JavaPluginTest : BasePluginTest() {
503503
)
504504
@Test
505505
fun canRegisterCustomShadowJarTask() {
506-
val mainClass = writeClass(sourceSet = "test", withImports = true)
506+
val mainClassEntry = writeClass(sourceSet = "test", withImports = true)
507507
val testShadowJarTask = "testShadowJar"
508508
projectScriptPath.appendText(
509509
"""
@@ -527,7 +527,7 @@ class JavaPluginTest : BasePluginTest() {
527527

528528
assertThat(jarPath("build/libs/my-1.0-tests.jar")).useAll {
529529
containsEntries(
530-
mainClass,
530+
mainClassEntry,
531531
*junitEntries,
532532
)
533533
getMainAttr(mainClassAttributeKey).isNotNull()
@@ -565,7 +565,7 @@ class JavaPluginTest : BasePluginTest() {
565565

566566
@Test
567567
fun worksWithArchiveFileName() {
568-
val mainClass = writeClass()
568+
val mainClassEntry = writeClass()
569569
projectScriptPath.appendText(
570570
"""
571571
dependencies {
@@ -581,7 +581,7 @@ class JavaPluginTest : BasePluginTest() {
581581

582582
assertThat(jarPath("build/libs/my-shadow.tar")).useAll {
583583
containsEntries(
584-
mainClass,
584+
mainClassEntry,
585585
*junitEntries,
586586
)
587587
}
@@ -618,7 +618,7 @@ class JavaPluginTest : BasePluginTest() {
618618

619619
@Test
620620
fun canAddExtraFilesIntoShadowJar() {
621-
val mainClass = writeClass()
621+
val mainClassEntry = writeClass()
622622
path("Foo").writeText("Foo")
623623
projectScriptPath.appendText(
624624
"""
@@ -637,7 +637,7 @@ class JavaPluginTest : BasePluginTest() {
637637

638638
assertThat(outputShadowJar).useAll {
639639
containsEntries(
640-
mainClass,
640+
mainClassEntry,
641641
"META-INF/a-1.0.jar",
642642
"Bar/Foo",
643643
)
@@ -656,7 +656,7 @@ class JavaPluginTest : BasePluginTest() {
656656
}
657657
assertThat(jarPath(unzipped.name)).useAll {
658658
containsEntries(*entriesInA)
659-
doesNotContainEntries(mainClass)
659+
doesNotContainEntries(mainClassEntry)
660660
}
661661
}
662662

@@ -668,7 +668,7 @@ class JavaPluginTest : BasePluginTest() {
668668
val fooJar = buildJar("foo.jar") {
669669
insert("module-info.class", "module myModuleName {}")
670670
}
671-
val mainClass = writeClass()
671+
val mainClassEntry = writeClass()
672672
writeClass(className = "module-info") {
673673
"module myModuleName {}"
674674
}
@@ -690,7 +690,7 @@ class JavaPluginTest : BasePluginTest() {
690690

691691
assertThat(outputShadowJar).useAll {
692692
containsEntries(
693-
mainClass,
693+
mainClassEntry,
694694
"module-info.class",
695695
)
696696
getContent("module-info.class").all {

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/KmpPluginTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class KmpPluginTest : BasePluginTest() {
2121

2222
@Test
2323
fun compatKmpJvmTarget() {
24-
val mainClass = writeClass(sourceSet = "jvmMain", isJava = false)
24+
val mainClassEntry = writeClass(sourceSet = "jvmMain", isJava = false)
2525
projectScriptPath.appendText(
2626
"""
2727
kotlin {
@@ -46,7 +46,7 @@ class KmpPluginTest : BasePluginTest() {
4646

4747
assertThat(outputShadowJar).useAll {
4848
containsEntries(
49-
mainClass,
49+
mainClassEntry,
5050
*entriesInAB,
5151
)
5252
}

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/RelocationTest.kt‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class RelocationTest : BasePluginTest() {
2727
@ParameterizedTest
2828
@MethodSource("prefixProvider")
2929
fun autoRelocation(relocationPrefix: String) {
30-
val mainClass = writeClass()
30+
val mainClassEntry = writeClass()
3131
projectScriptPath.appendText(
3232
"""
3333
dependencies {
@@ -45,11 +45,11 @@ class RelocationTest : BasePluginTest() {
4545

4646
assertThat(outputShadowJar).useAll {
4747
containsEntries(
48-
mainClass,
48+
mainClassEntry,
4949
*junitEntries.map { "$entryPrefix/$it" }.toTypedArray(),
5050
)
5151
doesNotContainEntries(
52-
"$entryPrefix/$mainClass",
52+
"$entryPrefix/$mainClassEntry",
5353
*junitEntries,
5454
)
5555
}
@@ -64,7 +64,7 @@ class RelocationTest : BasePluginTest() {
6464
)
6565
@Test
6666
fun relocateDependencyFiles() {
67-
val mainClass = writeClass()
67+
val mainClassEntry = writeClass()
6868
projectScriptPath.appendText(
6969
"""
7070
dependencies {
@@ -90,7 +90,7 @@ class RelocationTest : BasePluginTest() {
9090

9191
assertThat(outputShadowJar).useAll {
9292
containsEntries(
93-
mainClass,
93+
mainClassEntry,
9494
*runnerEntries,
9595
*frameworkEntries,
9696
*otherJunitEntries,
@@ -105,7 +105,7 @@ class RelocationTest : BasePluginTest() {
105105

106106
@Test
107107
fun relocateDependencyFilesWithFiltering() {
108-
val mainClass = writeClass()
108+
val mainClassEntry = writeClass()
109109
projectScriptPath.appendText(
110110
"""
111111
dependencies {
@@ -135,7 +135,7 @@ class RelocationTest : BasePluginTest() {
135135

136136
assertThat(outputShadowJar).useAll {
137137
containsEntries(
138-
mainClass,
138+
mainClassEntry,
139139
*runnerEntries,
140140
*frameworkEntries,
141141
*otherJunitEntries,

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/FilteringCachingTest.kt‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -71,8 +71,8 @@ class FilteringCachingTest : BaseCachingTest() {
7171
)
7272
@Test
7373
fun shadowJarIsCachedCorrectlyWhenUsingIncludesExcludes() {
74-
val mainClass = writeClass(className = "Main")
75-
val main2Class = writeClass(className = "Main2")
74+
val mainClassEntry = writeClass(className = "Main")
75+
val main2ClassEntry = writeClass(className = "Main2")
7676
projectScriptPath.appendText(
7777
"""
7878
dependencies {
@@ -85,8 +85,8 @@ class FilteringCachingTest : BaseCachingTest() {
8585
assertCompositeExecutions {
8686
containsEntries(
8787
*entriesInAB,
88-
mainClass,
89-
main2Class,
88+
mainClassEntry,
89+
main2ClassEntry,
9090
)
9191
}
9292

@@ -100,26 +100,26 @@ class FilteringCachingTest : BaseCachingTest() {
100100

101101
assertCompositeExecutions {
102102
containsEntries(
103-
mainClass,
104-
main2Class,
103+
mainClassEntry,
104+
main2ClassEntry,
105105
)
106106
doesNotContainEntries(*entriesInAB)
107107
}
108108

109109
projectScriptPath.appendText(
110110
"""
111111
$shadowJar {
112-
include '$mainClass'
112+
include '$mainClassEntry'
113113
}
114114
""".trimIndent() + System.lineSeparator(),
115115
)
116116

117117
assertCompositeExecutions {
118118
containsEntries(
119-
mainClass,
119+
mainClassEntry,
120120
)
121121
doesNotContainEntries(
122-
main2Class,
122+
main2ClassEntry,
123123
"a.properties",
124124
"a2.properties",
125125
"b.properties",
@@ -129,23 +129,23 @@ class FilteringCachingTest : BaseCachingTest() {
129129
projectScriptPath.appendText(
130130
"""
131131
$shadowJar {
132-
include '$main2Class'
132+
include '$main2ClassEntry'
133133
}
134134
""".trimIndent() + System.lineSeparator(),
135135
)
136136

137137
assertCompositeExecutions {
138138
containsEntries(
139-
mainClass,
140-
main2Class,
139+
mainClassEntry,
140+
main2ClassEntry,
141141
)
142142
doesNotContainEntries(*entriesInAB)
143143
}
144144
}
145145

146146
@Test
147147
fun shadowJarIsCachedCorrectlyWhenUsingDependencyIncludesExcludes() {
148-
val mainClass = writeClass(withImports = true)
148+
val mainClassEntry = writeClass(withImports = true)
149149
projectScriptPath.appendText(
150150
"""
151151
dependencies {
@@ -156,7 +156,7 @@ class FilteringCachingTest : BaseCachingTest() {
156156

157157
assertCompositeExecutions {
158158
containsEntries(
159-
mainClass,
159+
mainClassEntry,
160160
*junitEntries,
161161
)
162162
}
@@ -173,7 +173,7 @@ class FilteringCachingTest : BaseCachingTest() {
173173

174174
assertCompositeExecutions {
175175
containsEntries(
176-
mainClass,
176+
mainClassEntry,
177177
)
178178
doesNotContainEntries(
179179
*junitEntries,

‎src/functionalTest/kotlin/com/github/jengelman/gradle/plugins/shadow/caching/RelocationCachingTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ class RelocationCachingTest : BaseCachingTest() {
1818
}
1919
""".trimIndent() + System.lineSeparator(),
2020
)
21-
val mainClass = writeClass(withImports = true)
21+
val mainClassEntry = writeClass(withImports = true)
2222

2323
assertCompositeExecutions {
2424
containsEntries(
25-
mainClass,
25+
mainClassEntry,
2626
*junitEntries,
2727
)
2828
}
@@ -39,7 +39,7 @@ class RelocationCachingTest : BaseCachingTest() {
3939

4040
assertCompositeExecutions {
4141
containsEntries(
42-
mainClass,
42+
mainClassEntry,
4343
*shadowedEntries,
4444
)
4545
doesNotContainEntries(

0 commit comments

Comments
 (0)