diff --git a/.gitignore b/.gitignore index 8ba33ad..0027aeb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ build .idea .gradle +.intellijPlatform diff --git a/CHANGELOG.md b/CHANGELOG.md index 483410e..b62ead1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,12 +4,19 @@ [Unreleased]: https://github.com/samvtran/jetbrains-macos-keybindings-for-all/commits -## [2.0.0] +### Changed +- Build dependencies updates +- Plugin signing added + +## [2.0.0] - 2020-09-24 + ### Added - Updated to match latest keymap as of [367cd5f](https://github.com/JetBrains/intellij-community/blob/fb0eb45e7d27dffbb490030c623bcf65eb402aeb/platform/platform-resources/src/keymaps/Mac%20OS%20X%2010.5%2B.xml). - Support new commit tool window (`Alt-0` when commit is active) + ### Removed - `ActivateTODOToolWindow` removed from keymap as of [b6eda](https://github.com/JetBrains/intellij-community/commit/24fe6c91cc91d51a2042737e9b7d01dd94305943#diff-8d8929a05e92b93072513b4727735c81) to make room for the Problems view. + ### Fixed - Keymap range set to 2020.2.* and beyond (no `untilBuild`) - `NextSplitter` and `PrevSplitter` updated to prevent conflicts with Alt-Tab diff --git a/README.md b/README.md index 984c708..662c88f 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,8 @@ [Cheatsheet](Keymap-macOS%20For%20All.pdf) -This repo converts the macOS keymap (previously known as Mac OS X 10.5+) in JetBrains IDEs from -macOS-specific shortcuts to shortcuts without `meta` (i.e., the Command/splat/cloverleaf interchange -from hell). +This plugin converts the macOS keymap (previously known as Mac OS X 10.5+) in JetBrains IDEs from +macOS-specific shortcuts to shortcuts without the Command (⌘) key for use on Windows and Linux. While some keybindings are close to their original, others have more modifier keys or different bindings altogether to avoid conflicts. diff --git a/build.gradle.kts b/build.gradle.kts index 8466ae1..8a152f0 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -34,7 +34,7 @@ dependencies { // Plugin Dependencies. Uses `platformPlugins` property from the gradle.properties file for plugin from JetBrains Marketplace. plugins(providers.gradleProperty("platformPlugins").map { it.split(',') }) - + instrumentationTools() pluginVerifier() zipSigner() } @@ -45,19 +45,6 @@ intellijPlatform { pluginConfiguration { version = providers.gradleProperty("pluginVersion") - // Extract the <!-- Plugin description --> section from README.md and provide for the plugin's manifest - description = providers.fileContents(layout.projectDirectory.file("README.md")).asText.map { - val start = "<!-- Plugin description -->" - val end = "<!-- Plugin description end -->" - - with(it.lines()) { - if (!containsAll(listOf(start, end))) { - throw GradleException("Plugin description section not found in README.md:\n$start ... $end") - } - subList(indexOf(start) + 1, indexOf(end)).joinToString("\n").let(::markdownToHTML) - } - } - val changelog = project.changelog // local variable for configuration cache compatibility // Get the latest available change notes from the changelog file changeNotes = providers.gradleProperty("pluginVersion").map { pluginVersion -> diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index f1db6ec..a8cc836 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -4,7 +4,7 @@ <vendor email="jb@samvtran.com" url="https://github.com/samvtran">samvtran</vendor> <description><![CDATA[ - A keymap for Windows and Linux (and macOS if you really want!) that rebinds common macOS 10.5+ + A keymap for Windows and Linux that rebinds common macOS 10.5+ shortcuts to non-Command keys. Some shortcuts aren't 1:1 replacements of modifier keys, so please check the <a href="https://github.com/samvtran/jetbrains-macos-keybindings-for-all#key-updates">key updates table</a>.<br><br> If you notice any conflicting shortcuts or have a suggestion for a new keybinding, please