Skip to content

Commit c49796d

Browse files
committed
Merge branch 'refs/heads/master' into kdoc-fixes
2 parents 669b1e8 + 5e43ec9 commit c49796d

File tree

30 files changed

+31720
-10107
lines changed

30 files changed

+31720
-10107
lines changed

build.gradle.kts

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -235,7 +235,11 @@ kotlinPublications {
235235
apache2()
236236
}
237237
developers {
238-
developer("nikitinas", "Anatoly Nikitin", "[email protected]")
238+
developer("koperagen", "Nikita Klimenko", "[email protected]")
239+
developer("Jolanrensen", "Jolan Rensen", "[email protected]")
240+
developer("zaleslaw", "Aleksei Zinovev", "[email protected]")
241+
developer("ermolenkodev", "Nikita Ermolenko", "[email protected]")
242+
developer("nikitinas", "Anatoly Nikitin", "[email protected]")
239243
}
240244
}
241245

core/build.gradle.kts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import nl.jolanrensen.docProcessor.gradle.creatingProcessDocTask
66
import org.gradle.jvm.tasks.Jar
77
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
88
import org.jmailen.gradle.kotlinter.tasks.LintTask
9+
import xyz.ronella.gradle.plugin.simple.git.OSType
910
import xyz.ronella.gradle.plugin.simple.git.task.GitTask
1011

1112
plugins {
@@ -173,6 +174,14 @@ val installGitPreCommitHook by tasks.creating(Copy::class) {
173174
from(File(rootProject.rootDir, "gradle/scripts/pre-commit"))
174175
into(gitHooksDir)
175176
fileMode = 755
177+
178+
// Workaround for https://github.com/Kotlin/dataframe/issues/612
179+
if (OSType.identify() in listOf(OSType.Mac, OSType.Linux)) doLast {
180+
exec {
181+
workingDir(gitHooksDir)
182+
commandLine("chmod", "755", "pre-commit")
183+
}
184+
}
176185
} else {
177186
logger.lifecycle("'.git/hooks' directory not found. Skipping installation of pre-commit hook.")
178187
}

0 commit comments

Comments
 (0)