Merge pull request #40 from ciscorucinski/release/v2.2

Release/v2.2
ciscorucinski · Oct 1, 2017 · 2a62a63 · 2a62a63
2 parents 636d66f + daba356
commit 2a62a63
Show file tree

Hide file tree

Showing 9 changed files with 642 additions and 106 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,22 @@
+
+# ChroMATERIAL v2.2
+
+##### Updated
+
+| Type             | Supported |
+| :--------------: | :-------- |
+| **Theme**        | <kbd>ChroMATERIAL</kbd> <kbd>Darcula-compatible</kbd> <kbd>Darker</kbd> |
+
+##### Other Notable changes:
+
+ * Brought feature parity to all themes.
+ * Method separators are now visible if enabled.
+ * Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.
+ * Debugger has a new style. New colors and breakpoint lines are bold.
+ * Added bracket support to ignore files.
+ * Annotations are italic, and attribute names are purple.
+ * Diff & Merge have darker error stripe marks for conflicts and deleted text.
+
 # ChroMATERIAL v2.1.1
 
 ##### Updated

diff --git a/ChroMATERIAL/ChroMATERIAL.jar b/ChroMATERIAL/ChroMATERIAL.jar
diff --git a/ChroMATERIAL/build.gradle b/ChroMATERIAL/build.gradle
@@ -19,7 +19,7 @@ sourceSets {
 def GROUP_CHROMATERIAL = 'ChroMATERIAL'
 
 group 'com.facebook.rucinskic.chromaterial' //'io.github.ciscorucinski.chromaterial'
-version '2.1.1'
+version '2.2'
 
 def sourceDir = 'src/colors'
 def intelliJColorSchemeDir = "C:\\Users\\Christopher\\.Idea${intellij.type}${intellij.version}\\config\\colors"

diff --git a/ChroMATERIAL/libs/ChroMATERIAL-2.2.jar b/ChroMATERIAL/libs/ChroMATERIAL-2.2.jar
diff --git a/ChroMATERIAL/resources/META-INF/plugin.xml b/ChroMATERIAL/resources/META-INF/plugin.xml
@@ -1,7 +1,7 @@
 <idea-plugin>
   <id>com.facebook.rucinskic.chromaterial</id>
   <name>ChroMATERIAL</name>
-  <version>2.1.1</version>
+  <version>2.2</version>
   <vendor email="[email protected]" url="https://github.com/ciscorucinski/ChroMATERIAL">
     ChristopherRucinski
   </vendor>
@@ -22,6 +22,22 @@
   </description>
   <change-notes>
 
+        &lt;h2&gt;v2.2&lt;/h2&gt;
+        &lt;ul&gt;
+            &lt;li&gt;&lt;b&gt;Updated Themes:&lt;/b&gt; Darcula-compatible, Darker&lt;/li&gt;
+            &lt;br/&gt;
+            &lt;li&gt;&lt;b&gt;Notable changes:&lt;/b&gt;&lt;/li&gt;
+            &lt;br/&gt;
+            &lt;ul&gt;
+                &lt;li&gt;Brought feature parity to all themes.&lt;/li&gt;
+                &lt;li&gt;Method separators are now visible if enabled.&lt;/li&gt;
+                &lt;li&gt;Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.&lt;/li&gt;
+                &lt;li&gt;Debugger has a new style. New colors and breakpoint lines are bold.&lt;/li&gt;
+                &lt;li&gt;Added bracket support to ignore files.&lt;/li&gt;
+                &lt;li&gt;Annotations are italic, and attribute names are purple.&lt;/li&gt;
+                &lt;li&gt;Diff &amp; Merge have darker error stripe marks for conflicts and deleted text&lt;/li&gt;
+            &lt;/ul&gt;
+        &lt;/ul&gt;
         &lt;h2&gt;v2.1.1&lt;/h2&gt;
         &lt;ul&gt;
             &lt;li&gt;&lt;b&gt;Updated Support:&lt;/b&gt; Ignore Files&lt;/li&gt;

diff --git a/ChroMATERIAL/resources/html/changeLog.html b/ChroMATERIAL/resources/html/changeLog.html
@@ -1,4 +1,20 @@
 <html>
+<h2>v2.2</h2>
+<ul>
+    <li><b>Updated Themes:</b> Darcula-compatible, Darker</li>
+    <br/>
+    <li><b>Notable changes:</b></li>
+    <br/>
+    <ul>
+        <li>Brought feature parity to all themes.</li>
+        <li>Method separators are now visible if enabled.</li>
+        <li>Breadcrumbs have a new style that is compatible with Android Studio and IntelliJ IDEs.</li>
+        <li>Debugger has a new style. New colors and breakpoint lines are bold.</li>
+        <li>Added bracket support to ignore files.</li>
+        <li>Annotations are italic, and attribute names are purple.</li>
+        <li>Diff & Merge have darker error stripe marks for conflicts and deleted text</li>
+    </ul>
+</ul>
 <h2>v2.1.1</h2>
 <ul>
     <li><b>Updated Support:</b> Ignore Files</li>