Skip to content

Commit

Permalink
Merge pull request #631 from doki-theme/enhancmentsNStuff
Browse files Browse the repository at this point in the history
Enhancments n stuff
  • Loading branch information
Unthrottled authored Jan 29, 2023
2 parents 6077002 + 6bfe410 commit 510e5ee
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 8 deletions.
18 changes: 17 additions & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ that are not captured by the global shared style.

## Editing Themes Required Software

- Java 11
- Java 17
- IntellIJ 2020.3+

## Editing Themes Setup
Expand All @@ -42,6 +42,22 @@ Once that is done, for extra points, you can register the `masterThemes` directo

![VCS Root Config](./assets/contributingAssets/vcs_root.png)

## Build Setup

I have several codebases that I maintain which have a similar build processes.
So to reduce maintenance overhead, this repository uses https://github.com/doki-theme/doki-build-source-jvm .

Doing so requires special setup for your development environment.

- First, you'll need to [Authenticate to GitHub Packages](https://docs.github.com/en/packages/learn-github-packages/introduction-to-github-packages#authenticating-to-github-packages)
- Next, you'll need to set your GitHub username as the environment variable `GITHUB_TOKEN` when you run the plugin.
- After that, use the access token you created from the first step as the value of the environment variable `GITHUB_TOKEN`.
- Run, the plugin.

See this video for how to set it up to run in IntelliJ.

https://user-images.githubusercontent.com/15972415/215237933-469a5643-e8d9-4990-b47e-1db274629323.mp4

## Running Plugin

The [Gradle IntelliJ Plugin](https://github.com/JetBrains/gradle-intellij-plugin#gradle-intellij-plugin) does all of the
Expand Down
Binary file added assets/contributingAssets/run_ide_with_env.mp4
Binary file not shown.
5 changes: 5 additions & 0 deletions buildSrc/assets/templates/dark.scheme.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -357,6 +357,11 @@
<option name="ERROR_STRIPE_COLOR" value="$constantColor$"/>
</value>
</option>
<option name="CODE_LENS_BORDER_COLOR">
<value>
<option name="EFFECT_COLOR" value="%accentColor%AA"/>
</value>
</option>
<option name="CODE_VISION_DEFAULT">
<value>
<option name="FOREGROUND" value="$comments$"/>
Expand Down
5 changes: 5 additions & 0 deletions buildSrc/assets/templates/light.scheme.template.xml
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,11 @@
<option name="ERROR_STRIPE_COLOR" value="$constantColor$"/>
</value>
</option>
<option name="CODE_LENS_BORDER_COLOR">
<value>
<option name="EFFECT_COLOR" value="%accentColor%AA"/>
</value>
</option>
<option name="CODE_VISION_DEFAULT">
<value>
<option name="FOREGROUND" value="$comments$"/>
Expand Down
4 changes: 2 additions & 2 deletions buildSrc/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ repositories {
name = "GitHubPackages"
url = uri("https://maven.pkg.github.com/doki-theme/doki-build-source-jvm")
credentials {
username = System.getenv("GITHUB_ACTOR")
password = System.getenv("GITHUB_TOKEN")
username = System.getenv("GITHUB_ACTOR") ?: ""
password = System.getenv("GITHUB_TOKEN") ?: ""
}
}
}
Expand Down
1 change: 1 addition & 0 deletions buildSrc/src/main/kotlin/BuildThemes.kt
Original file line number Diff line number Diff line change
Expand Up @@ -666,6 +666,7 @@ open class BuildThemes : DefaultTask() {
): Node {
val themeTemplate = editorTemplate.clone() as Node
themeTemplate.breadthFirst()
.filterIsInstance<Node>()
.map { it as Node }
.forEach {
when (it.name()) {
Expand Down
7 changes: 6 additions & 1 deletion changelog/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
Changelog
---
# 88.3-1.8.3 [Code Lens Update]

- Updated the border color of the `Code Lens` feature.
- Updated contributing documentation for new build process requirements.


# 88.3-1.8.2 [Initial 2023.1 Build Support]

- Added the initial 2023.1 build support.


# 88.3-1.8.1 [Global Font Fix]

- Fixed issue with global font override not being applied after IDE was restarted.
Expand Down
3 changes: 2 additions & 1 deletion changelog/RELEASE-NOTES.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
- Fixed issue with global font override not being applied after IDE was restarted.
- Added the initial 2023.1 build support.
- Added the initial 2023.1 build support.
- Updated the border color of the `Code Lense` feature.
6 changes: 3 additions & 3 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# -> https://www.jetbrains.org/intellij/sdk/docs/reference_guide/intellij_artifacts.html

pluginGroup=io.unthrottled
pluginVersion=88.3-1.8.2
pluginVersion=88.3-1.8.3
pluginSinceBuild=222
pluginUntilBuild = 231.*

Expand All @@ -11,11 +11,11 @@ pluginUntilBuild = 231.*
pluginVerifierIdeVersions = 2022.2, 2022.3

platformType = IU
platformVersion = 2022.3
platformVersion = 2022.3.2
platformDownloadSources = true
# Plugin Dependencies -> https://www.jetbrains.org/intellij/sdk/docs/basics/plugin_structure/plugin_dependencies.html
# Example: platformPlugins = com.intellij.java,com.jetbrains.php:203.4449.22
platformPlugins = XPathView,izhangzhihao.rainbow.brackets:6.26
platformPlugins = XPathView,izhangzhihao.rainbow.brackets:6.26,io.unthrottled.doki.icons:88.3-1.0.2

# Java language level used to compile sources and to generate the files for - Java 11 is required since 2020.3
javaVersion = 17
Expand Down

0 comments on commit 510e5ee

Please sign in to comment.