zontreck/ACLauncher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix: don't run unit tests through xvfb and revert flatlaf package update due to NPE on build

Browse source
This commit is contained in:
Ryan Dowling 2022-03-05 17:25:06 +11:00
parent 09f29d4f3f
commit 2df6c28e48
No known key found for this signature in database
GPG key ID: 5539FCDB88950EFD
10 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/workflows/application.yml vendored
View file

@ -52,9 +52,7 @@ jobs:
${{ runner.os }}-gradle-
- name: Run Unit Tests
uses: GabrielBB/xvfb-action@v1
with:
run: ./gradlew test --tests com.atlauncher.*
run: ./gradlew test --tests com.atlauncher.*
- name: Run UI Tests
uses: GabrielBB/xvfb-action@v1

4
build.gradle
View file

@ -62,8 +62,8 @@ dependencies {
implementation 'com.sangupta:murmur:1.0.0'
implementation 'org.apache.commons:commons-lang3:3.12.0'
implementation 'org.apache.commons:commons-text:1.9'
implementation 'com.formdev:flatlaf:2.0.2'
implementation 'com.formdev:flatlaf-extras:2.0.2'
implementation 'com.formdev:flatlaf:1.6.1'
implementation 'com.formdev:flatlaf-extras:1.6.1'
implementation 'com.github.oshi:oshi-core:6.1.4'
implementation 'net.freeutils:jlhttp:2.6'
implementation 'joda-time:joda-time:2.10.13'

2
src/main/resources/com/atlauncher/themes/ATLauncherLaf.properties
View file

@ -91,7 +91,7 @@ CheckBox.icon.borderColor=$border
CheckBox.icon.selectedBorderColor=$border
CheckBox.icon.background=$checkboxBackground
CheckBox.icon.checkmarkColor=$checkboxCheck
CheckBox.icon.focusedSelectedBorderColor=$focusedBorder
CheckBox.icon.selectedFocusedBorderColor=$focusedBorder
CheckBox.icon.focusedBorderColor=$focusedBorder
#---- CollapsiblePanel ----

2
src/main/resources/com/atlauncher/themes/ArcOrange.properties
View file

@ -31,7 +31,7 @@ buttonBackground=#ffffff
#---- checkbox ----
CheckBox.icon.focusColor=#f57900
CheckBox.icon.focusedSelectedBorderColor=#f57900
CheckBox.icon.selectedFocusedBorderColor=#f57900
CheckBox.icon.focusedBorderColor=#f57900
CheckBox.icon.background=#ffffff
CheckBox.icon.disabledBackground=#e1e3e6

2
src/main/resources/com/atlauncher/themes/CyanLight.properties
View file

@ -37,7 +37,7 @@ CheckBox.icon.selectedBorderColor=#2896b2
CheckBox.icon.checkmarkColor=#FFFFFF
CheckBox.icon.focusColor=#5fc5de
CheckBox.icon.focusedBorderColor=#98a0aa4c
CheckBox.icon.focusedSelectedBorderColor=#82d3dd
CheckBox.icon.selectedFocusedBorderColor=#82d3dd
CheckBox.icon.disabledBackground=#e4e6eb
CheckBox.icon.disabledBorderColor=#babfc4
CheckBox.icon.disabledCheckmarkColor=#babfc4

2
src/main/resources/com/atlauncher/themes/DraculaContrast.properties
View file

@ -40,7 +40,7 @@ CheckBox.icon.disabledCheckmarkColor=#6272A4
CheckBox.icon.selectedBackground=#282A36
CheckBox.icon.selectedBorderColor=#FF79C5
CheckBox.icon.checkmarkColor=#FF79C5
CheckBox.icon.focusedSelectedBorderColor=#F8F8F2
CheckBox.icon.selectedFocusedBorderColor=#F8F8F2
#---- all the things ----
*.acceleratorSelectionForeground=#6272A4

2
src/main/resources/com/atlauncher/themes/MaterialPalenightContrast.properties
View file

@ -40,7 +40,7 @@ CheckBox.icon.disabledCheckmarkColor=#515772
CheckBox.icon.selectedBackground=#292D3E
CheckBox.icon.selectedBorderColor=#ab47bc
CheckBox.icon.checkmarkColor=#ab47bc
CheckBox.icon.focusedSelectedBorderColor=#A6ACCD
CheckBox.icon.selectedFocusedBorderColor=#A6ACCD
#---- all the things ----
*.acceleratorSelectionForeground=#676E95

2
src/main/resources/com/atlauncher/themes/MonokaiPro.properties
View file

@ -40,7 +40,7 @@ CheckBox.icon.disabledCheckmarkColor=#5b595c
CheckBox.icon.selectedBackground=#2D2A2E
CheckBox.icon.selectedBorderColor=#ffd866
CheckBox.icon.checkmarkColor=#ffd866
CheckBox.icon.focusedSelectedBorderColor=#fcfcfa
CheckBox.icon.selectedFocusedBorderColor=#fcfcfa
#---- all the things ----
*.acceleratorSelectionForeground=#939293

2
src/main/resources/com/atlauncher/themes/OneDark.properties
View file

@ -75,7 +75,7 @@ CheckBox.icon.focusColor=$accent
CheckBox.icon.focusedBorderColor=$accent
CheckBox.icon.selectedBackground=$backgroundDark
CheckBox.icon.selectedBorderColor=$accent
CheckBox.icon.focusedSelectedBorderColor=$accent
CheckBox.icon.selectedFocusedBorderColor=$accent
CheckBox.icon.disabledBackground=$backgroundDark
#---- Text Field ----

2
src/main/resources/com/atlauncher/themes/Vuesion.properties
View file

@ -35,7 +35,7 @@ CheckBox.icon.borderColor=#303a45
CheckBox.icon.checkmarkColor=#ececee
CheckBox.icon.focusColor=#216fe0
CheckBox.icon.focusedBorderColor=#216fe0
CheckBox.icon.focusedSelectedBorderColor=#216fe0
CheckBox.icon.selectedFocusedBorderColor=#216fe0
CheckBox.icon.disabledBackground=#202831
CheckBox.icon.disabledBorderColor=#303a45
CheckBox.icon.disabledCheckmarkColor=#a56a01