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 idea sync failing on composite builds, add support for composite builds #367

Open
wants to merge 17 commits into
base: main
Choose a base branch
from
+781 −95
Open

fix idea sync failing on composite builds, add support for composite builds #367

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
2059401
fix idea sync on included builds
NikkyAI Jun 6, 2021
02f3ac9
fix gradle wrapper symlinks
NikkyAI Jun 7, 2021
1920ae6
Merge remote-tracking branch 'jmfayard/main' into indluce-builds
NikkyAI Jun 7, 2021
8e9f9a5
fix weirdness with kotlin version lookup
NikkyAI Jun 7, 2021
1f7403b
sample: included project uses parent versions file again
NikkyAI Jun 7, 2021
b5bcd87
fixed kotlin plugin version resolve error
NikkyAI Jun 7, 2021
65219fc
Revert "fixed kotlin plugin version resolve error"
NikkyAI Jun 7, 2021
0c32b93
make it not overwrite the versions.properties from included builds
NikkyAI Jun 7, 2021
1e103f7
fix symlinks
NikkyAI Jun 7, 2021
19cd661
this breaks projects, find a better way to do this
NikkyAI Jun 7, 2021
e523891
separate config instances by rootProject
NikkyAI Jun 7, 2021
8a77544
Merge remote-tracking branch 'jmfayard/main' into indluce-builds
NikkyAI Jun 7, 2021
4d5b25e
ensure plugins are not leaking across projects either
NikkyAI Jun 7, 2021
91ecbe2
only reset config holder once each of its entries reset
NikkyAI Jun 8, 2021
aa4f3db
add project arguments to versionFor() call in groovy sample
NikkyAI Jun 8, 2021
15304c3
remove leftover debug logs and fix buildSrc idea sync
NikkyAI Jun 8, 2021
4ca3e5f
move versionFor into `versions` extension
NikkyAI Jun 9, 2021
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
Prev Previous commit
Next Next commit
fixed kotlin plugin version resolve error
@NikkyAI
NikkyAI committed Jun 7, 2021
commit b5bcd87cbc09fccc5a1f33ea0c69abcd19b6728e
2 changes: 1 addition & 1 deletion plugins/core/src/main/kotlin/de/fayard/refreshVersions/core/RefreshVersionsCoreSetup.kt
View file
Original file line number Diff line number Diff line change
@@ -140,7 +140,7 @@ private fun setupPluginsVersionsResolution(
}
val pluginNamespace = requested.id.namespace ?: ""
val versionKey = when {
pluginNamespace.startsWith("org.jetbrains.kotlin.") -> "version.kotlin"
pluginNamespace.startsWith("org.jetbrains.kotlin") -> "version.kotlin"
pluginNamespace.startsWith("com.android.") -> "plugin.android"
else -> "plugin.$pluginId"
}
3 changes: 0 additions & 3 deletions sample-include-build/versions.properties
View file
Original file line number Diff line number Diff line change
@@ -76,9 +76,6 @@ version.kotest=4.1.3
## # available=4.5.0
## # available=4.6.0

# TODO: investigate why included build needs THIS? on linux
plugin.org.jetbrains.kotlin.jvm=version.kotlin

version.kotlin=1.4.32
## # available=1.5.0-M1
## # available=1.5.0-M2