Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Renzu generating for Ant, Kobalt and Maven #894

Merged
merged 9 commits into from
Jul 1, 2018
Merged

Fix Renzu generating for Ant, Kobalt and Maven #894

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
89ba0b5
Fix Renzu generating for Ant, Kobalt and Maven
andrzejressel Jun 17, 2018
eeaa788
PR comments
andrzejressel Jun 17, 2018
f8c54c2
Fix build
andrzejressel Jun 17, 2018
dd03034
Merge branch 'master' into feature/maven_fix
pakoito Jun 17, 2018
cd9874a
Merge branch 'master' into feature/maven_fix
pakoito Jun 22, 2018
f6de23f
Merge branch 'master' into feature/maven_fix
nomisRev Jun 24, 2018
880754b
Merge branch 'master' into feature/maven_fix
pakoito Jun 24, 2018
ff03971
Add settings.gradle.kt
andrzejressel Jul 1, 2018
76736fe
Merge branch 'master' into feature/maven_fix
andrzejressel Jul 1, 2018
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
14 changes: 9 additions & 5 deletions modules/core/arrow-annotations-processor/src/main/java/arrow/common/utils/ProcessorUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,12 +169,16 @@ fun ClassOrPackageDataWrapper.typeConstraints(): String =
}
}

fun recurseFilesUpwards(fileName: String): File =
recurseFilesUpwards(fileName, File(".").absoluteFile)
fun recurseFilesUpwards(fileNames: Set<String>): File =
recurseFilesUpwards(fileNames, File(".").absoluteFile)

fun recurseFilesUpwards(fileName: String, currentDirectory: File): File =
if (currentDirectory.list().contains(fileName)) {
fun recurseFilesUpwards(fileNames: Set<String>, currentDirectory: File): File {
Copy link
Member

@pakoito pakoito Jun 17, 2018 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tailrec? Looks like tailrec to me.


val filesInDir = currentDirectory.list()

return if ((filesInDir.intersect(fileNames)).isNotEmpty()) {
currentDirectory
} else {
recurseFilesUpwards(fileName, currentDirectory.parentFile)
recurseFilesUpwards(fileNames, currentDirectory.parentFile)
}
}
5 changes: 4 additions & 1 deletion modules/core/arrow-annotations-processor/src/main/java/arrow/renzu/RenzuGenerator.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,13 @@ class RenzuGenerator(
}

fun generate() {

val topLevelFiles = setOf("settings.gradle", "pom.xml", "build.xml", "Build.kt", "settings.gradle.kt")

val generatedDir = if (isolateForTests)
File("./infographic")
else
File("${recurseFilesUpwards("settings.gradle").absolutePath}/infographic")
File("${recurseFilesUpwards(topLevelFiles).absolutePath}/infographic")
.also { it.mkdirs() }

val file = File(generatedDir, "arrow-infographic.txt")
Expand Down