Merge branch 'release/1.2.0' into main

.circleci/config.yml

@@ -14,7 +14,7 @@ jobs:
       - restore_cache:
           key: v1-gradle-wrapper-{{ checksum "gradle/wrapper/gradle-wrapper.properties" }}
       - restore_cache:
-          key: v1-gradle-cache-{{ checksum "build.gradle.kts" }}
+          key: v1-gradle-cache-{{ checksum "build.gradle.kts" }}-{{ checksum "buildSrc/src/main/kotlin/Deps.kt"}}
       - run:
           name: Run tests
           command: ./gradlew check
@@ -25,7 +25,7 @@ jobs:
       - save_cache:
           paths:
             - ~/.gradle/caches
-          key: v1-gradle-cache-{{ checksum "build.gradle.kts" }}
+          key: v1-gradle-cache-{{ checksum "build.gradle.kts" }}-{{ checksum "buildSrc/src/main/kotlin/Deps.kt"}}
       - store_test_results:
           path: build/test-results/test
       - store_artifacts:
@@ -40,6 +40,6 @@ workflows:
             branches:
               only:
                 - develop
-                - master
+                - main
                 - /release\/.*/
                 - /hotfix\/.*/

README.md

@@ -3,7 +3,7 @@
 [![License](https://img.shields.io/badge/license-Apache%202.0-brightgreen.svg?style=for-the-badge)](http://www.apache.org/licenses/LICENSE-2.0)
 [![JetBrains IntelliJ Plugins](https://img.shields.io/jetbrains/plugin/v/15267-proguard-retrace-unscrambler?style=for-the-badge)][3]
 
-This is an [IntelliJ IDEA][1] and [Android Studio][2] Plugin to deobfuscate your stacktraces.
+This is an [IntelliJ IDEA][1] and [Android Studio][2] Plugin to de-obfuscate your stacktraces.
 
 ## Installation
 
@@ -18,8 +18,12 @@ Download it from the Plugin Marketplace: [Proguard Retrace Unscrambler][3]
 
 In IntelliJ IDEA or Android Studio
 
-* Go to Analyze -> Stack Trace
-* In the dialog select `Proguard Retrace` and add the path to the Proguard/R8 mapping file
+* Go to _Analyze_
+* Select _Analyze Stacktrace…_
+* Check _Unscramble stacktrace_
+* Select _Proguard Retrace_
+* Choose Proguard/R8 mapping file in _Log file_
+* Paste stacktrace and Press _OK_
 
 ## License
 

build.gradle.kts

@@ -16,6 +16,7 @@
 
 import kotlinx.html.b
 import kotlinx.html.br
+import kotlinx.html.em
 import kotlinx.html.li
 import kotlinx.html.p
 import kotlinx.html.stream.createHTML
@@ -38,7 +39,7 @@ plugins {
 }
 
 group = "com.cmgapps.intellij"
-version = "1.1.0"
+version = "1.2.0"
 
 repositories {
     jcenter()
@@ -49,7 +50,7 @@ val ktlint by configurations.creating
 
 dependencies {
     implementation(kotlin("stdlib-jdk8", Deps.kotlinVersion))
-    implementation("net.sf.proguard:proguard-retrace:" + Deps.retraceVersion)
+    implementation("com.guardsquare:proguard-retrace:" + Deps.retraceVersion)
     implementation("com.squareup.okio:okio:" + Deps.okioVersion)
 
     ktlint("com.pinterest:ktlint:" + Deps.ktlintVersion)
@@ -128,6 +129,22 @@ tasks {
     // region IntelliJ Plugin
     patchPluginXml {
         val notes = createHTML(prettyPrint = false).p {
+            b {
+                +"1.2.0"
+            }
+            ul {
+                li {
+                    +"Change to "
+                    em {
+                        +"guardsquare"
+                    }
+                    +" coordinates"
+                }
+                li {
+                    +"Add plugin icon"
+                }
+            }
+            br
             b {
                 +"1.1.0"
             }
@@ -160,4 +177,8 @@ tasks {
         }
     }
     // endregion
+
+    check {
+        dependsOn(verifyPlugin)
+    }
 }

buildSrc/src/main/kotlin/Deps.kt

@@ -15,13 +15,13 @@
  */
 
 object Deps {
-    const val depUpdatesPluginVersion = "0.33.0"
+    const val depUpdatesPluginVersion = "0.36.0"
     const val hamcrestVersion = "2.2"
-    const val intellijVersion = "0.6.1"
+    const val intellijVersion = "0.6.3"
     const val junitVersion = "5.7.0"
     const val kotlinVersion = "1.4.10"
     const val ktlintVersion = "0.39.0"
     const val mockitoVersion = "3.6.0"
     const val okioVersion = "2.9.0"
-    const val retraceVersion = "6.2.2"
+    const val retraceVersion = "7.0.1"
 }

src/main/kotlin/com/cmgapps/intellij/ProguardRetraceUnscrambler.kt

@@ -51,7 +51,7 @@ class ProguardRetraceUnscrambler : UnscrambleSupport<JComponent> {
         return LineNumberReader(StringReader(text)).use { reader ->
             val buffer = Buffer()
             PrintWriter(buffer.outputStream()).use { writer ->
-                ReTrace(ReTrace.STACK_TRACE_EXPRESSION, false, mappingFile).retrace(reader, writer)
+                ReTrace(mappingFile).retrace(reader, writer)
                 buffer.readUtf8()
             }
         }

src/main/resources/META-INF/plugin.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <!--
   ~ Copyright (c) 2020. Christian Grach <christian.grach@cmgapps.com>
   ~
@@ -13,7 +14,6 @@
   ~ See the License for the specific language governing permissions and
   ~ limitations under the License.
   -->
-
 <idea-plugin>
     <id>com.cmgapps.intellij.proguard-retrace-unscambler</id>
     <name>Proguard Retrace Unscrambler</name>