Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
ec282f3
Intro assertk and lints
Goooler Nov 30, 2024
8897494
integrationTestImplementation main sourceSet
Goooler Nov 30, 2024
a8bd26c
Migrate SimpleRelocatorParameterTest
Goooler Nov 30, 2024
f68b945
Migrate SimpleRelocatorTest
Goooler Nov 30, 2024
7c78960
Migrate ApacheLicenseResourceTransformerTest
Goooler Nov 30, 2024
4223c7a
Merge remote-tracking branch 'origin/main' into g/migrate-unit-tests
Goooler Nov 30, 2024
81d4cba
Fix merge
Goooler Nov 30, 2024
fdcfde2
Merge remote-tracking branch 'origin/main' into g/migrate-unit-tests
Goooler Nov 30, 2024
fb9c674
Migrate AppendingTransformerTest
Goooler Nov 30, 2024
fb31caf
Migrate XmlAppendingTransformerTest
Goooler Nov 30, 2024
a0a216f
Migrate ApacheNoticeResourceTransformerTest
Goooler Nov 30, 2024
1eb69b6
Merge remote-tracking branch 'origin/main' into g/migrate-unit-tests
Goooler Nov 30, 2024
912ac6c
Fix merge
Goooler Nov 30, 2024
c9279dd
Merge remote-tracking branch 'origin/main' into g/migrate-unit-tests
Goooler Nov 30, 2024
3d6e23d
Fix merge
Goooler Nov 30, 2024
35cb0b2
Move packages
Goooler Nov 30, 2024
04cb7ea
Migrate ManifestAppenderTransformerTest
Goooler Nov 30, 2024
7d3c0f6
Migrate PropertiesFileTransformerTest
Goooler Nov 30, 2024
1965c0a
Migrate ComponentsXmlResourceTransformerTest
Goooler Nov 30, 2024
8e55c4f
Move sources into test source set
Goooler Nov 30, 2024
e3544de
Rename groovy folder to kotlin
Goooler Nov 30, 2024
dd2c603
Merge branch 'g/move-sources-for-temp' into g/migrate-unit-tests
Goooler Nov 30, 2024
217f2ce
Mark internal
Goooler Nov 30, 2024
a25f017
Change suffixes to .kt
Goooler Nov 30, 2024
3fd2a19
Merge branch 'g/move-sources-for-temp' into g/migrate-unit-tests
Goooler Nov 30, 2024
979dc95
Replace IOUtil
Goooler Nov 30, 2024
a7c7567
Remove redundant throwing
Goooler Nov 30, 2024
3653a4e
Remove SimpleRelocatorParameterTest as it's outdated
Goooler Nov 30, 2024
7b730f2
Cleanups
Goooler Nov 30, 2024
13da152
Rename setUp to setup
Goooler Nov 30, 2024
381136c
Cleanups
Goooler Nov 30, 2024
85d8129
Migrate java.io.File usages
Goooler Nov 30, 2024
3f094a0
Reuse doTransformAndGetTransformedPath
Goooler Nov 30, 2024
7ce919b
Cleanups
Goooler Nov 30, 2024
89bd766
Disable lintAnalyzeJvmTest for some devices
Goooler Nov 30, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ indent_style = space
insert_final_newline = true
trim_trailing_whitespace = true

[*.{groovy,java}]
indent_size = 4

[*.{kt,kts}]
ij_kotlin_imports_layout = *
ij_kotlin_allow_trailing_comma = true
Expand Down
10 changes: 10 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ dependencies {

testImplementation(platform(libs.junit.bom))
testImplementation(libs.junit.jupiter)
testImplementation(libs.assertk)
testImplementation(libs.xmlunit)
testImplementation(libs.apache.commonsLang)
testRuntimeOnly(libs.junit.platformLauncher)
Expand All @@ -87,6 +88,7 @@ dependencies {
funcTestImplementation(sourceSets.main.get().output)

lintChecks(libs.androidx.gradlePluginLints)
lintChecks(libs.assertk.lint)
}

val integrationTest by tasks.registering(Test::class) {
Expand Down Expand Up @@ -130,6 +132,14 @@ tasks.withType<Test>().configureEach {
)
}

tasks.whenTaskAdded {
if (name == "lintAnalyzeJvmTest") {
// This task often fails on Windows CI devices.
enabled = !providers.systemProperty("os.name").get().startsWith("Windows") &&
!providers.environmentVariable("CI").isPresent
}
}

tasks.register("release") {
dependsOn(
tasks.publish,
Expand Down
2 changes: 2 additions & 0 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,15 @@ plexus-xml = "org.codehaus.plexus:plexus-xml:4.0.4"
xmlunit = "org.xmlunit:xmlunit-legacy:2.10.0"

androidx-gradlePluginLints = "androidx.lint:lint-gradle:1.0.0-alpha02"
assertk-lint = "com.jzbrooks:assertk-lint:1.3.0"
# Dummy to get renovate updates, the version is used in rootProject build.gradle with spotless.
ktlint = "com.pinterest.ktlint:ktlint-cli:1.4.1"

spock = "org.spockframework:spock-core:2.3-groovy-3.0"
junit-bom = "org.junit:junit-bom:5.11.3"
junit-jupiter = { module = "org.junit.jupiter:junit-jupiter" }
junit-platformLauncher = { module = "org.junit.platform:junit-platform-launcher" }
assertk = "com.willowtreeapps.assertk:assertk:0.28.1"

[plugins]
kotlin = "org.jetbrains.kotlin.jvm:2.1.0"
Expand Down
2 changes: 2 additions & 0 deletions src/funcTest/.editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[*.{groovy,java}]
indent_size = 4
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import org.codehaus.plexus.util.xml.Xpp3Dom
import org.codehaus.plexus.util.xml.Xpp3DomBuilder
import org.codehaus.plexus.util.xml.Xpp3DomWriter
import org.gradle.api.file.FileTreeElement
import org.gradle.api.tasks.Internal

/**
* A resource processor that aggregates plexus `components.xml` files.
Expand Down Expand Up @@ -89,8 +90,8 @@ public open class ComponentsXmlResourceTransformer : Transformer {

override fun hasTransformedResource(): Boolean = components.isNotEmpty()

@get:Throws(IOException::class)
private val transformedResource: ByteArray
@get:Internal
internal val transformedResource: ByteArray
get() {
val os = ByteArrayOutputStream(1024 * 4)
XmlStreamWriter(os).use { writer ->
Expand Down
4 changes: 0 additions & 4 deletions src/test/.editorconfig

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading