Move int-ui modules to the top level

JetBrains · Sep 20, 2023 · 29bff14 · 29bff14
1 parent 1a97366
commit 29bff14
Show file tree

Hide file tree

Showing 82 changed files with 7 additions and 8 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -12,8 +12,8 @@ val sarif: Configuration by configurations.creating {
 dependencies {
     sarif(projects.core)
     sarif(projects.samples.standalone)
-    sarif(projects.themes.intUi.intUiStandalone)
-    sarif(projects.themes.intUi.intUiCore)
+    sarif(projects.intUi.intUiStandalone)
+    sarif(projects.intUi.intUiCore)
 }
 
 tasks {

diff --git a/ide-laf-bridge/build.gradle.kts b/ide-laf-bridge/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 dependencies {
-    api(projects.themes.intUi.intUiStandalone)
+    api(projects.intUi.intUiStandalone)
     compileOnly(libs.bundles.idea)
 
     testImplementation(compose.desktop.uiTestJUnit4)

diff --git a/themes/int-ui/int-ui-core/build.gradle.kts → int-ui/int-ui-core/build.gradle.kts b/themes/int-ui/int-ui-core/build.gradle.kts → int-ui/int-ui-core/build.gradle.kts
diff --git a/...jewel/themes/intui/core/BaseIntUiTheme.kt → ...jewel/themes/intui/core/BaseIntUiTheme.kt b/...jewel/themes/intui/core/BaseIntUiTheme.kt → ...jewel/themes/intui/core/BaseIntUiTheme.kt
diff --git a/...emes/intui/core/IntUiThemeColorPalette.kt → ...emes/intui/core/IntUiThemeColorPalette.kt b/...emes/intui/core/IntUiThemeColorPalette.kt → ...emes/intui/core/IntUiThemeColorPalette.kt
diff --git a/...themes/intui/core/IntUiThemeDefinition.kt → ...themes/intui/core/IntUiThemeDefinition.kt b/...themes/intui/core/IntUiThemeDefinition.kt → ...themes/intui/core/IntUiThemeDefinition.kt
diff --git a/...l/themes/intui/core/IntelliJSvgPatcher.kt → ...l/themes/intui/core/IntelliJSvgPatcher.kt b/...l/themes/intui/core/IntelliJSvgPatcher.kt → ...l/themes/intui/core/IntelliJSvgPatcher.kt
diff --git a/...int-ui/int-ui-standalone/build.gradle.kts → int-ui/int-ui-standalone/build.gradle.kts b/...int-ui/int-ui-standalone/build.gradle.kts → int-ui/int-ui-standalone/build.gradle.kts
@@ -4,5 +4,5 @@ plugins {
 }
 
 dependencies {
-    api(projects.themes.intUi.intUiCore)
+    api(projects.intUi.intUiCore)
 }
diff --git a/...mes/intui/standalone/IntUiGlobalColors.kt → ...mes/intui/standalone/IntUiGlobalColors.kt b/...mes/intui/standalone/IntUiGlobalColors.kt → ...mes/intui/standalone/IntUiGlobalColors.kt
diff --git a/...es/intui/standalone/IntUiGlobalMetrics.kt → ...es/intui/standalone/IntUiGlobalMetrics.kt b/...es/intui/standalone/IntUiGlobalMetrics.kt → ...es/intui/standalone/IntUiGlobalMetrics.kt
diff --git a/...wel/themes/intui/standalone/IntUiTheme.kt → ...wel/themes/intui/standalone/IntUiTheme.kt b/...wel/themes/intui/standalone/IntUiTheme.kt → ...wel/themes/intui/standalone/IntUiTheme.kt
diff --git a/...ewel/themes/intui/standalone/InterFont.kt → ...ewel/themes/intui/standalone/InterFont.kt b/...ewel/themes/intui/standalone/InterFont.kt → ...ewel/themes/intui/standalone/InterFont.kt
diff --git a/.../standalone/styling/IntUiButtonStyling.kt → .../standalone/styling/IntUiButtonStyling.kt b/.../standalone/styling/IntUiButtonStyling.kt → .../standalone/styling/IntUiButtonStyling.kt
diff --git a/...tandalone/styling/IntUiCheckboxStyling.kt → ...tandalone/styling/IntUiCheckboxStyling.kt b/...tandalone/styling/IntUiCheckboxStyling.kt → ...tandalone/styling/IntUiCheckboxStyling.kt
diff --git a/...ui/standalone/styling/IntUiChipStyling.kt → ...ui/standalone/styling/IntUiChipStyling.kt b/...ui/standalone/styling/IntUiChipStyling.kt → ...ui/standalone/styling/IntUiChipStyling.kt
diff --git a/...tandalone/styling/IntUiDropdownStyling.kt → ...tandalone/styling/IntUiDropdownStyling.kt b/...tandalone/styling/IntUiDropdownStyling.kt → ...tandalone/styling/IntUiDropdownStyling.kt
diff --git a/...dalone/styling/IntUiGroupHeaderStyling.kt → ...dalone/styling/IntUiGroupHeaderStyling.kt b/...dalone/styling/IntUiGroupHeaderStyling.kt → ...dalone/styling/IntUiGroupHeaderStyling.kt
diff --git a/...ling/IntUiHorizontalProgressBarStyling.kt → ...ling/IntUiHorizontalProgressBarStyling.kt b/...ling/IntUiHorizontalProgressBarStyling.kt → ...ling/IntUiHorizontalProgressBarStyling.kt
diff --git a/.../styling/IntUiLabelledTextFieldStyling.kt → .../styling/IntUiLabelledTextFieldStyling.kt b/.../styling/IntUiLabelledTextFieldStyling.kt → .../styling/IntUiLabelledTextFieldStyling.kt
diff --git a/...tandalone/styling/IntUiLazyTreeStyling.kt → ...tandalone/styling/IntUiLazyTreeStyling.kt b/...tandalone/styling/IntUiLazyTreeStyling.kt → ...tandalone/styling/IntUiLazyTreeStyling.kt
diff --git a/...ui/standalone/styling/IntUiLinkStyling.kt → ...ui/standalone/styling/IntUiLinkStyling.kt b/...ui/standalone/styling/IntUiLinkStyling.kt → ...ui/standalone/styling/IntUiLinkStyling.kt
diff --git a/...ui/standalone/styling/IntUiMenuStyling.kt → ...ui/standalone/styling/IntUiMenuStyling.kt b/...ui/standalone/styling/IntUiMenuStyling.kt → ...ui/standalone/styling/IntUiMenuStyling.kt
diff --git a/...dalone/styling/IntUiRadioButtonStyling.kt → ...dalone/styling/IntUiRadioButtonStyling.kt b/...dalone/styling/IntUiRadioButtonStyling.kt → ...dalone/styling/IntUiRadioButtonStyling.kt
diff --git a/...andalone/styling/IntUiScrollbarStyling.kt → ...andalone/styling/IntUiScrollbarStyling.kt b/...andalone/styling/IntUiScrollbarStyling.kt → ...andalone/styling/IntUiScrollbarStyling.kt
diff --git a/...tui/standalone/styling/IntUiTabStyling.kt → ...tui/standalone/styling/IntUiTabStyling.kt b/...tui/standalone/styling/IntUiTabStyling.kt → ...tui/standalone/styling/IntUiTabStyling.kt
diff --git a/...tandalone/styling/IntUiTextAreaStyling.kt → ...tandalone/styling/IntUiTextAreaStyling.kt b/...tandalone/styling/IntUiTextAreaStyling.kt → ...tandalone/styling/IntUiTextAreaStyling.kt
diff --git a/...andalone/styling/IntUiTextFieldStyling.kt → ...andalone/styling/IntUiTextFieldStyling.kt b/...andalone/styling/IntUiTextFieldStyling.kt → ...andalone/styling/IntUiTextFieldStyling.kt
diff --git a/...ain/resources/fonts/inter/Inter-Black.ttf → ...ain/resources/fonts/inter/Inter-Black.ttf b/...ain/resources/fonts/inter/Inter-Black.ttf → ...ain/resources/fonts/inter/Inter-Black.ttf
diff --git a/...main/resources/fonts/inter/Inter-Bold.ttf → ...main/resources/fonts/inter/Inter-Bold.ttf b/...main/resources/fonts/inter/Inter-Bold.ttf → ...main/resources/fonts/inter/Inter-Bold.ttf
diff --git a/...resources/fonts/inter/Inter-ExtraBold.ttf → ...resources/fonts/inter/Inter-ExtraBold.ttf b/...resources/fonts/inter/Inter-ExtraBold.ttf → ...resources/fonts/inter/Inter-ExtraBold.ttf
diff --git a/...esources/fonts/inter/Inter-ExtraLight.ttf → ...esources/fonts/inter/Inter-ExtraLight.ttf b/...esources/fonts/inter/Inter-ExtraLight.ttf → ...esources/fonts/inter/Inter-ExtraLight.ttf
diff --git a/...ain/resources/fonts/inter/Inter-Light.ttf → ...ain/resources/fonts/inter/Inter-Light.ttf b/...ain/resources/fonts/inter/Inter-Light.ttf → ...ain/resources/fonts/inter/Inter-Light.ttf
diff --git a/...in/resources/fonts/inter/Inter-Medium.ttf → ...in/resources/fonts/inter/Inter-Medium.ttf b/...in/resources/fonts/inter/Inter-Medium.ttf → ...in/resources/fonts/inter/Inter-Medium.ttf
diff --git a/...n/resources/fonts/inter/Inter-Regular.ttf → ...n/resources/fonts/inter/Inter-Regular.ttf b/...n/resources/fonts/inter/Inter-Regular.ttf → ...n/resources/fonts/inter/Inter-Regular.ttf
diff --git a/.../resources/fonts/inter/Inter-SemiBold.ttf → .../resources/fonts/inter/Inter-SemiBold.ttf b/.../resources/fonts/inter/Inter-SemiBold.ttf → .../resources/fonts/inter/Inter-SemiBold.ttf
diff --git a/...main/resources/fonts/inter/Inter-Thin.ttf → ...main/resources/fonts/inter/Inter-Thin.ttf b/...main/resources/fonts/inter/Inter-Thin.ttf → ...main/resources/fonts/inter/Inter-Thin.ttf
diff --git a/...ne/src/main/resources/icons/intui/add.svg → ...ne/src/main/resources/icons/intui/add.svg b/...ne/src/main/resources/icons/intui/add.svg → ...ne/src/main/resources/icons/intui/add.svg
diff --git a/...c/main/resources/icons/intui/add_dark.svg → ...c/main/resources/icons/intui/add_dark.svg b/...c/main/resources/icons/intui/add_dark.svg → ...c/main/resources/icons/intui/add_dark.svg
diff --git a/...c/main/resources/icons/intui/checkBox.svg → ...c/main/resources/icons/intui/checkBox.svg b/...c/main/resources/icons/intui/checkBox.svg → ...c/main/resources/icons/intui/checkBox.svg
diff --git a/...esources/icons/intui/checkBoxDisabled.svg → ...esources/icons/intui/checkBoxDisabled.svg b/...esources/icons/intui/checkBoxDisabled.svg → ...esources/icons/intui/checkBoxDisabled.svg
diff --git a/...ces/icons/intui/checkBoxDisabled_dark.svg → ...ces/icons/intui/checkBoxDisabled_dark.svg b/...ces/icons/intui/checkBoxDisabled_dark.svg → ...ces/icons/intui/checkBoxDisabled_dark.svg
diff --git a/...resources/icons/intui/checkBoxFocused.svg → ...resources/icons/intui/checkBoxFocused.svg b/...resources/icons/intui/checkBoxFocused.svg → ...resources/icons/intui/checkBoxFocused.svg
diff --git a/...rces/icons/intui/checkBoxFocused_dark.svg → ...rces/icons/intui/checkBoxFocused_dark.svg b/...rces/icons/intui/checkBoxFocused_dark.svg → ...rces/icons/intui/checkBoxFocused_dark.svg
diff --git a/...s/intui/checkBoxIndeterminateSelected.svg → ...s/intui/checkBoxIndeterminateSelected.svg b/...s/intui/checkBoxIndeterminateSelected.svg → ...s/intui/checkBoxIndeterminateSelected.svg
diff --git a/...checkBoxIndeterminateSelectedDisabled.svg → ...checkBoxIndeterminateSelectedDisabled.svg b/...checkBoxIndeterminateSelectedDisabled.svg → ...checkBoxIndeterminateSelectedDisabled.svg
diff --git a/...BoxIndeterminateSelectedDisabled_dark.svg → ...BoxIndeterminateSelectedDisabled_dark.svg b/...BoxIndeterminateSelectedDisabled_dark.svg → ...BoxIndeterminateSelectedDisabled_dark.svg
diff --git a/.../checkBoxIndeterminateSelectedFocused.svg → .../checkBoxIndeterminateSelectedFocused.svg b/.../checkBoxIndeterminateSelectedFocused.svg → .../checkBoxIndeterminateSelectedFocused.svg
diff --git a/...kBoxIndeterminateSelectedFocused_dark.svg → ...kBoxIndeterminateSelectedFocused_dark.svg b/...kBoxIndeterminateSelectedFocused_dark.svg → ...kBoxIndeterminateSelectedFocused_dark.svg
diff --git a/...ui/checkBoxIndeterminateSelected_dark.svg → ...ui/checkBoxIndeterminateSelected_dark.svg b/...ui/checkBoxIndeterminateSelected_dark.svg → ...ui/checkBoxIndeterminateSelected_dark.svg
diff --git a/...esources/icons/intui/checkBoxSelected.svg → ...esources/icons/intui/checkBoxSelected.svg b/...esources/icons/intui/checkBoxSelected.svg → ...esources/icons/intui/checkBoxSelected.svg
diff --git a/.../icons/intui/checkBoxSelectedDisabled.svg → .../icons/intui/checkBoxSelectedDisabled.svg b/.../icons/intui/checkBoxSelectedDisabled.svg → .../icons/intui/checkBoxSelectedDisabled.svg
diff --git a/...s/intui/checkBoxSelectedDisabled_dark.svg → ...s/intui/checkBoxSelectedDisabled_dark.svg b/...s/intui/checkBoxSelectedDisabled_dark.svg → ...s/intui/checkBoxSelectedDisabled_dark.svg
diff --git a/...s/icons/intui/checkBoxSelectedFocused.svg → ...s/icons/intui/checkBoxSelectedFocused.svg b/...s/icons/intui/checkBoxSelectedFocused.svg → ...s/icons/intui/checkBoxSelectedFocused.svg
diff --git a/...ns/intui/checkBoxSelectedFocused_dark.svg → ...ns/intui/checkBoxSelectedFocused_dark.svg b/...ns/intui/checkBoxSelectedFocused_dark.svg → ...ns/intui/checkBoxSelectedFocused_dark.svg
diff --git a/...ces/icons/intui/checkBoxSelected_dark.svg → ...ces/icons/intui/checkBoxSelected_dark.svg b/...ces/icons/intui/checkBoxSelected_dark.svg → ...ces/icons/intui/checkBoxSelected_dark.svg
diff --git a/...n/resources/icons/intui/checkBox_dark.svg → ...n/resources/icons/intui/checkBox_dark.svg b/...n/resources/icons/intui/checkBox_dark.svg → ...n/resources/icons/intui/checkBox_dark.svg
diff --git a/...ain/resources/icons/intui/chevronDown.svg → ...ain/resources/icons/intui/chevronDown.svg b/...ain/resources/icons/intui/chevronDown.svg → ...ain/resources/icons/intui/chevronDown.svg
diff --git a/...esources/icons/intui/chevronDown_dark.svg → ...esources/icons/intui/chevronDown_dark.svg b/...esources/icons/intui/chevronDown_dark.svg → ...esources/icons/intui/chevronDown_dark.svg
diff --git a/...in/resources/icons/intui/chevronRight.svg → ...in/resources/icons/intui/chevronRight.svg b/...in/resources/icons/intui/chevronRight.svg → ...in/resources/icons/intui/chevronRight.svg
diff --git a/...sources/icons/intui/chevronRight_dark.svg → ...sources/icons/intui/chevronRight_dark.svg b/...sources/icons/intui/chevronRight_dark.svg → ...sources/icons/intui/chevronRight_dark.svg
diff --git a/...main/resources/icons/intui/closeSmall.svg → ...main/resources/icons/intui/closeSmall.svg b/...main/resources/icons/intui/closeSmall.svg → ...main/resources/icons/intui/closeSmall.svg
diff --git a/...sources/icons/intui/closeSmallHovered.svg → ...sources/icons/intui/closeSmallHovered.svg b/...sources/icons/intui/closeSmallHovered.svg → ...sources/icons/intui/closeSmallHovered.svg
diff --git a/...es/icons/intui/closeSmallHovered_dark.svg → ...es/icons/intui/closeSmallHovered_dark.svg b/...es/icons/intui/closeSmallHovered_dark.svg → ...es/icons/intui/closeSmallHovered_dark.svg
diff --git a/...icons/intui/closeSmallSelectedHovered.svg → ...icons/intui/closeSmallSelectedHovered.svg b/...icons/intui/closeSmallSelectedHovered.svg → ...icons/intui/closeSmallSelectedHovered.svg
diff --git a/.../intui/closeSmallSelectedHovered_dark.svg → .../intui/closeSmallSelectedHovered_dark.svg b/.../intui/closeSmallSelectedHovered_dark.svg → .../intui/closeSmallSelectedHovered_dark.svg
diff --git a/...resources/icons/intui/closeSmall_dark.svg → ...resources/icons/intui/closeSmall_dark.svg b/...resources/icons/intui/closeSmall_dark.svg → ...resources/icons/intui/closeSmall_dark.svg
diff --git a/...in/resources/icons/intui/externalLink.svg → ...in/resources/icons/intui/externalLink.svg b/...in/resources/icons/intui/externalLink.svg → ...in/resources/icons/intui/externalLink.svg
diff --git a/.../src/main/resources/icons/intui/radio.svg → .../src/main/resources/icons/intui/radio.svg b/.../src/main/resources/icons/intui/radio.svg → .../src/main/resources/icons/intui/radio.svg
diff --git a/...n/resources/icons/intui/radioDisabled.svg → ...n/resources/icons/intui/radioDisabled.svg b/...n/resources/icons/intui/radioDisabled.svg → ...n/resources/icons/intui/radioDisabled.svg
diff --git a/...ources/icons/intui/radioDisabled_dark.svg → ...ources/icons/intui/radioDisabled_dark.svg b/...ources/icons/intui/radioDisabled_dark.svg → ...ources/icons/intui/radioDisabled_dark.svg
diff --git a/...in/resources/icons/intui/radioFocused.svg → ...in/resources/icons/intui/radioFocused.svg b/...in/resources/icons/intui/radioFocused.svg → ...in/resources/icons/intui/radioFocused.svg
diff --git a/...sources/icons/intui/radioFocused_dark.svg → ...sources/icons/intui/radioFocused_dark.svg b/...sources/icons/intui/radioFocused_dark.svg → ...sources/icons/intui/radioFocused_dark.svg
diff --git a/...n/resources/icons/intui/radioSelected.svg → ...n/resources/icons/intui/radioSelected.svg b/...n/resources/icons/intui/radioSelected.svg → ...n/resources/icons/intui/radioSelected.svg
diff --git a/...ces/icons/intui/radioSelectedDisabled.svg → ...ces/icons/intui/radioSelectedDisabled.svg b/...ces/icons/intui/radioSelectedDisabled.svg → ...ces/icons/intui/radioSelectedDisabled.svg
diff --git a/...cons/intui/radioSelectedDisabled_dark.svg → ...cons/intui/radioSelectedDisabled_dark.svg b/...cons/intui/radioSelectedDisabled_dark.svg → ...cons/intui/radioSelectedDisabled_dark.svg
diff --git a/...rces/icons/intui/radioSelectedFocused.svg → ...rces/icons/intui/radioSelectedFocused.svg b/...rces/icons/intui/radioSelectedFocused.svg → ...rces/icons/intui/radioSelectedFocused.svg
diff --git a/...icons/intui/radioSelectedFocused_dark.svg → ...icons/intui/radioSelectedFocused_dark.svg b/...icons/intui/radioSelectedFocused_dark.svg → ...icons/intui/radioSelectedFocused_dark.svg
diff --git a/...ources/icons/intui/radioSelected_dark.svg → ...ources/icons/intui/radioSelected_dark.svg b/...ources/icons/intui/radioSelected_dark.svg → ...ources/icons/intui/radioSelected_dark.svg
diff --git a/...main/resources/icons/intui/radio_dark.svg → ...main/resources/icons/intui/radio_dark.svg b/...main/resources/icons/intui/radio_dark.svg → ...main/resources/icons/intui/radio_dark.svg
diff --git a/samples/ide-plugin/build.gradle.kts b/samples/ide-plugin/build.gradle.kts
@@ -22,6 +22,5 @@ repositories {
 
 dependencies {
     implementation(compose.desktop.currentOs)
-    implementation(projects.themes.intUi.intUiStandalone)
     implementation(projects.ideLafBridge)
 }
diff --git a/samples/standalone/build.gradle.kts b/samples/standalone/build.gradle.kts
@@ -8,7 +8,7 @@ plugins {
 }
 
 dependencies {
-    implementation(projects.themes.intUi.intUiStandalone)
+    implementation(projects.intUi.intUiStandalone)
 }
 
 compose.desktop {

diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -29,6 +29,6 @@ include(
     ":ide-laf-bridge",
     ":samples:standalone",
     ":samples:ide-plugin",
-    ":themes:int-ui:int-ui-core",
-    ":themes:int-ui:int-ui-standalone",
+    ":int-ui:int-ui-core",
+    ":int-ui:int-ui-standalone",
 )