Skip to content

Commit 2536c78

Browse files
authored
Version 0.1.3
2 parents 426cffc + a729f60 commit 2536c78

File tree

6 files changed

+40
-77
lines changed

6 files changed

+40
-77
lines changed

.github/workflows/build.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,13 +16,11 @@
1616
name: Build
1717
on: [push, pull_request]
1818
jobs:
19-
2019
# Run Gradle Wrapper Validation Action to verify the wrapper's checksum
2120
gradleValidation:
2221
name: Gradle Wrapper
2322
runs-on: ubuntu-latest
2423
steps:
25-
2624
# Check out current repository
2725
- name: Fetch Sources
2826
uses: actions/checkout@v2
@@ -37,7 +35,6 @@ jobs:
3735
needs: gradleValidation
3836
runs-on: ubuntu-latest
3937
steps:
40-
4138
# Setup Java 1.8 environment for the next steps
4239
- name: Setup Java
4340
uses: actions/setup-java@v1
@@ -82,7 +79,6 @@ jobs:
8279
changelog: ${{ steps.properties.outputs.changelog }}
8380
artifact: ${{ steps.properties.outputs.artifact }}
8481
steps:
85-
8682
# Setup Java 1.8 environment for the next steps
8783
- name: Setup Java
8884
uses: actions/setup-java@v1
@@ -144,7 +140,6 @@ jobs:
144140
needs: build
145141
runs-on: ubuntu-latest
146142
steps:
147-
148143
# Setup Java 1.8 environment for the next steps
149144
- name: Setup Java
150145
uses: actions/setup-java@v1
@@ -199,7 +194,6 @@ jobs:
199194
needs: [build, verify]
200195
runs-on: ubuntu-latest
201196
steps:
202-
203197
# Check out current repository
204198
- name: Fetch Sources
205199
uses: actions/checkout@v2

.github/workflows/release.yml

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,36 @@ on:
77
types: [prereleased, released]
88

99
jobs:
10-
1110
# Prepare and publish the plugin to the Marketplace repository
12-
release:
13-
name: Publish Plugin
14-
runs-on: ubuntu-latest
15-
steps:
11+
# release:
12+
# name: Publish Plugin
13+
# runs-on: ubuntu-latest
14+
# steps:
1615

17-
# Setup Java 1.8 environment for the next steps
18-
- name: Setup Java
19-
uses: actions/setup-java@v1
20-
with:
21-
java-version: 1.8
16+
# # Setup Java 1.8 environment for the next steps
17+
# - name: Setup Java
18+
# uses: actions/setup-java@v1
19+
# with:
20+
# java-version: 1.8
2221

23-
# Check out current repository
24-
- name: Fetch Sources
25-
uses: actions/checkout@v2
26-
with:
27-
ref: ${{ github.event.release.tag_name }}
22+
# # Check out current repository
23+
# - name: Fetch Sources
24+
# uses: actions/checkout@v2
25+
# with:
26+
# ref: ${{ github.event.release.tag_name }}
2827

29-
# Publish the plugin to the Marketplace
30-
- name: Publish Plugin
31-
env:
32-
PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
33-
run: ./gradlew publishPlugin
28+
# # Publish the plugin to the Marketplace
29+
# - name: Publish Plugin
30+
# env:
31+
# PUBLISH_TOKEN: ${{ secrets.PUBLISH_TOKEN }}
32+
# run: ./gradlew publishPlugin
3433

3534
# Patch changelog, commit and push to the current repository
3635
changelog:
3736
name: Update Changelog
38-
needs: release
37+
# needs: release
3938
runs-on: ubuntu-latest
4039
steps:
41-
4240
# Setup Java 1.8 environment for the next steps
4341
- name: Setup Java
4442
uses: actions/setup-java@v1

CHANGELOG.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,9 @@
44

55
All notable changes to this project will be documented in this file.
66

7-
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
8-
to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
9-
107
## [Unreleased]
118

129
### Added
1310

1411
- Initial version of plugin
12+
- Update dependencies

build.gradle.kts

Lines changed: 12 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,21 @@
11
import io.gitlab.arturbosch.detekt.Detekt
2-
import org.jetbrains.changelog.closure
3-
import org.jetbrains.changelog.date
42
import org.jetbrains.changelog.markdownToHTML
53
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
64

75
fun properties(key: String) = project.findProperty(key).toString()
86

97
plugins {
10-
// Java support
118
id("java")
12-
// Kotlin support
139
id("org.jetbrains.kotlin.jvm") version "1.5.0"
14-
// gradle-intellij-plugin - read more: https://github.com/JetBrains/gradle-intellij-plugin
1510
id("org.jetbrains.intellij") version "0.7.3"
16-
// gradle-changelog-plugin - read more: https://github.com/JetBrains/gradle-changelog-plugin
1711
id("org.jetbrains.changelog") version "1.1.2"
18-
// detekt linter - read more: https://detekt.github.io/detekt/gradle.html
1912
id("io.gitlab.arturbosch.detekt") version "1.16.0"
20-
// ktlint linter - read more: https://github.com/JLLeitschuh/ktlint-gradle
2113
id("org.jlleitschuh.gradle.ktlint") version "10.0.0"
2214
}
2315

2416
group = properties("pluginGroup")
2517
version = properties("pluginVersion")
2618

27-
// Configure project's dependencies
2819
repositories {
2920
mavenCentral()
3021
jcenter()
@@ -33,33 +24,21 @@ dependencies {
3324
detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0")
3425
}
3526

36-
// Configure gradle-intellij-plugin plugin.
37-
// Read more: https://github.com/JetBrains/gradle-intellij-plugin
3827
intellij {
3928
pluginName = properties("pluginName")
4029
version = properties("platformVersion")
4130
type = properties("platformType")
4231
downloadSources = properties("platformDownloadSources").toBoolean()
4332
updateSinceUntilBuild = true
4433

45-
// Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file.
4634
setPlugins(*properties("platformPlugins").split(',').map(String::trim).filter(String::isNotEmpty).toTypedArray())
4735
}
4836

49-
// Configure gradle-changelog-plugin plugin.
50-
// Read more: https://github.com/JetBrains/gradle-changelog-plugin
5137
changelog {
5238
version = properties("pluginVersion")
53-
path = "${project.projectDir}/CHANGELOG.md"
54-
header = closure { "[$version] - ${date()}" }
55-
itemPrefix = "-"
56-
keepUnreleasedSection = true
57-
unreleasedTerm = "[Unreleased]"
58-
groups = listOf("Added", "Changed", "Deprecated", "Removed", "Fixed", "Security")
39+
groups = emptyList()
5940
}
6041

61-
// Configure detekt plugin.
62-
// Read more: https://detekt.github.io/detekt/kotlindsl.html
6342
detekt {
6443
config = files("./detekt-config.yml")
6544
buildUponDefaultConfig = true
@@ -72,7 +51,6 @@ detekt {
7251
}
7352

7453
tasks {
75-
// Set the compatibility versions to 1.8
7654
withType<JavaCompile> {
7755
sourceCompatibility = "1.8"
7856
targetCompatibility = "1.8"
@@ -91,36 +69,27 @@ tasks {
9169
untilBuild(properties("pluginUntilBuild"))
9270

9371
pluginDescription(
94-
closure {
95-
File("./README.md").readText().lines().run {
96-
val start = "<!-- Plugin description -->"
97-
val end = "<!-- Plugin description end -->"
98-
99-
if (!containsAll(listOf(start, end))) {
100-
throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
101-
}
102-
subList(indexOf(start) + 1, indexOf(end))
103-
}.joinToString("\n").run { markdownToHTML(this) }
104-
}
72+
File("./README.md").readText().lines().run {
73+
val start = "<!-- Plugin description -->"
74+
val end = "<!-- Plugin description end -->"
75+
76+
if (!containsAll(listOf(start, end))) {
77+
throw GradleException("Plugin description section not found in README.md:\n$start ... $end")
78+
}
79+
subList(indexOf(start) + 1, indexOf(end))
80+
}.joinToString("\n").run { markdownToHTML(this) }
10581
)
10682

107-
changeNotes(
108-
closure {
109-
changelog.getUnreleased().toHTML()
110-
}
111-
)
83+
changeNotes(changelog.getUnreleased().toHTML())
11284
}
11385

11486
runPluginVerifier {
115-
ideVersions(properties("pluginVerifierIdeVersions"))
87+
ideVersions(properties("pluginVerifierIdeVersions").split(',').map(String::trim).filter(String::isNotEmpty))
11688
}
11789

11890
publishPlugin {
11991
dependsOn("patchChangelog")
12092
token(System.getenv("PUBLISH_TOKEN"))
121-
// pluginVersion is based on the SemVer (https://semver.org) and supports pre-release labels, like 2.1.7-alpha.3
122-
// Specify pre-release label to publish the plugin in a custom Release Channel automatically. Read more:
123-
// https://plugins.jetbrains.com/docs/intellij/deployment.html#specifying-a-release-channel
12493
channels(properties("pluginVersion").split('-').getOrElse(1) { "default" }.split('.').first())
12594
}
12695
}

gradle.properties

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# -> https://plugins.jetbrains.com/docs/intellij/intellij-artifacts.html
33
pluginGroup=com.github.getomni.jetbrains
44
pluginName=Omni Theme
5-
pluginVersion=0.1.2
5+
pluginVersion=0.1.3
66
pluginSinceBuild=201.6668.113
7-
pluginUntilBuild=211.*
8-
pluginVerifierIdeVersions=201.8743.12, 202.8194.7, 203.7148.57
7+
pluginUntilBuild=212.*
8+
pluginVerifierIdeVersions=201.8743.12, 202.8194.7, 203.7148.57, 211.6693.111
99
platformType=IC
1010
platformVersion=2020.2.4
1111
platformDownloadSources=true

src/main/resources/Omni.theme.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,10 @@
5151
"lineSeparatorColor": "BGDarker"
5252
},
5353

54+
"PopupMenuSeparator": {
55+
"height": 1
56+
},
57+
5458
"ToolBar": {
5559
"background": "BGLighter"
5660
},

0 commit comments

Comments
 (0)