frogmc/phytotelma
6
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

resolve transitive aws from all dependencies
All checks were successful
Publish to snapshot maven / build (push) Successful in 26s
Details

Browse source
This commit is contained in:
moehreag 2024-06-13 10:38:35 +02:00
parent 41e34721cb
commit 6cd02d95c9
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
build.gradle.kts
View file

@ -7,7 +7,7 @@ plugins {
}
group = "dev.frogmc"
version = "0.0.1-alpha.4"
version = "0.0.1-alpha.5"
repositories {
maven {

32
src/main/kotlin/dev/frogmc/phytotelma/accesswidener/AccessWidener.kt
View file

@ -42,21 +42,21 @@ object AccessWidener {
return null
}
private fun findDependencyAWs(project: Project): List<Path> {
private fun findDependencyAWs(project: Project): Stream<String> {
val conf = project.configurations.getByName(JavaPlugin.RUNTIME_CLASSPATH_CONFIGURATION_NAME)
return conf.dependencies.filterIsInstance<ProjectDependency>().map {
getAWFile(it.dependencyProject)
}.plus(conf.resolvedConfiguration.firstLevelModuleDependencies.flatMap {
dep -> dep.moduleArtifacts
}.map { it.file.toPath() }.filter { it.exists() && it.isRegularFile() }.map {
FileSystems.newFileSystem(it).use {fs ->
val metadata = fs.getPath(Constants.MOD_METADATA_FILE)
PARSER.parse(metadata, FileNotFoundAction.READ_NOTHING)
.get<String>("frog.extensions.accesswidener")?.let { name ->
return@map metadata.resolveSibling(name)
}
}
}.toList()).filterNotNull()
val projectDeps = conf.dependencies.filterIsInstance<ProjectDependency>()
.mapNotNull { getAWFile(it.dependencyProject) }.stream().flatMap { readTransitiveAW(it) }
val dependencies = conf.resolvedConfiguration.files.map { it.toPath() }.filter { it.exists() && it.isRegularFile() }.stream().flatMap {
FileSystems.newFileSystem(it).use {fs ->
val metadata = fs.getPath(Constants.MOD_METADATA_FILE)
PARSER.parse(metadata, FileNotFoundAction.READ_NOTHING)
.get<String>("frog.extensions.accesswidener")?.let { name ->
return@flatMap readTransitiveAW(metadata.resolveSibling(name))
}
}
return@flatMap null
}.filter { it != null }
return Stream.concat(projectDeps, dependencies)
}
fun needsUpdate(project: Project): Boolean {
@ -81,12 +81,12 @@ object AccessWidener {
}
private fun readTransitiveAW(path: Path): Stream<String> {
return path.bufferedReader(StandardCharsets.UTF_8).lines().filter { it.startsWith("transitive-") }
return path.bufferedReader(StandardCharsets.UTF_8).takeIf { HEADER.test(it.readLine() ?: "") }?.lines()?.filter { it.startsWith("transitive-") }?: Stream.empty()
}
private fun readAllAWs(project: Project): Stream<Entry> {
return Stream.concat(
findDependencyAWs(project).stream().flatMap { i -> readTransitiveAW(i) },
findDependencyAWs(project),
readAW(project)
)
.filter { it.isNotBlank() }