Skip to content

Commit

Permalink
Merge branch 'release/1.7.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
chrimaeon committed Apr 10, 2023
2 parents 04b3219 + 94f11f4 commit 0da0cfe
Show file tree
Hide file tree
Showing 12 changed files with 75 additions and 52 deletions.
1 change: 1 addition & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ on:
tags:
- '**'
workflow_dispatch:
pull_request:

jobs:
checkAndUnitTest:
Expand Down
1 change: 1 addition & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@

### Security

## 1.7.0

### Changed
- Update Retrace to version 7.3.2
- Minimum IntelliJ Idea Version is now **2020.1** and Android Studio Version is **4.1**

## 1.6.0

### Changed
Expand Down
40 changes: 21 additions & 19 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import kotlinx.kover.api.CounterType
import kotlinx.kover.api.VerificationValueType
import org.gradle.api.tasks.testing.logging.TestLogEvent
import org.jetbrains.changelog.Changelog
import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
import java.util.Date

plugins {
Expand All @@ -37,7 +36,7 @@ plugins {
}

group = "com.cmgapps.intellij"
version = "1.6.0"
version = "1.7.0"

repositories {
mavenCentral()
Expand All @@ -51,9 +50,18 @@ intellij {
plugins.add("java")
}

val javaLanguageVersion = JavaLanguageVersion.of(8)

java {
sourceCompatibility = JavaVersion.VERSION_1_8
targetCompatibility = JavaVersion.VERSION_1_8
toolchain {
languageVersion.set(javaLanguageVersion)
}
}

kotlin {
jvmToolchain {
languageVersion.set(javaLanguageVersion)
}
}

kover {
Expand Down Expand Up @@ -83,7 +91,7 @@ changelog {
header.set(
provider {
version.get()
}
},
)
}

Expand All @@ -93,12 +101,6 @@ tasks {
gradleVersion = libs.versions.gradle.get()
}

withType<KotlinCompile> {
kotlinOptions {
jvmTarget = JavaVersion.VERSION_1_8.toString()
}
}

test {
useJUnitPlatform()
testLogging {
Expand All @@ -116,8 +118,8 @@ tasks {
"Built-Date" to Date(),
"Built-JDK" to System.getProperty("java.version"),
"Built-Gradle" to gradle.gradleVersion,
"Built-Kotlin" to libs.versions.kotlin.get()
)
"Built-Kotlin" to libs.versions.kotlin.get(),
),
)
}
}
Expand All @@ -130,7 +132,7 @@ tasks {
args = listOf(
"src/**/*.kt",
"--reporter=plain",
"--reporter=checkstyle,output=$buildDir/reports/ktlint.xml"
"--reporter=checkstyle,output=$buildDir/reports/ktlint.xml",
)
}

Expand All @@ -153,6 +155,7 @@ tasks {

// region IntelliJ Plugin
patchPluginXml {
sinceBuild.set("201")
changeNotes.set(
provider {
val item = if (changelog.has(project.version as String)) {
Expand All @@ -163,9 +166,9 @@ tasks {
changelog.renderItem(
item.withHeader(false)
.withEmptySections(false),
Changelog.OutputType.HTML
Changelog.OutputType.HTML,
)
}
},
)
}

Expand All @@ -178,11 +181,10 @@ tasks {

runPluginVerifier {
ideVersions.addAll(
"IC-2018.1.8",
"IC-2019.1.4",
"IC-2020.1.4",
"IC-2021.1.3",
"IC-2022.3"
"IC-2022.3",
"IC-2023.1",
)
}

Expand Down
18 changes: 9 additions & 9 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
[versions]
kotlin = "1.7.22"
mockito = "4.9.0"
gradle = "7.6"
kotlin = "1.8.20"
mockito = "5.2.0"
gradle = "8.0.2"

[plugins]
kotlin-jvm = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin"}
intellij = "org.jetbrains.intellij:1.10.1"
intellij = "org.jetbrains.intellij:1.13.3"
changelog = "org.jetbrains.changelog:2.0.0"
depUpdates = "com.github.ben-manes.versions:0.44.0"
depUpdates = "com.github.ben-manes.versions:0.46.0"
kover = "org.jetbrains.kotlinx.kover:0.6.1"

[libraries]
kotlin-stdlib-jdk8 = { module = "org.jetbrains.kotlin:kotlin-stdlib-jdk8", version.ref = "kotlin"}
proguard-retrace = "com.guardsquare:proguard-retrace:7.3.0"
okio = "com.squareup.okio:okio:3.2.0"
ktlint = "com.pinterest:ktlint:0.47.1"
junit-bom = "org.junit:junit-bom:5.9.1"
proguard-retrace = "com.guardsquare:proguard-retrace:7.3.2"
okio = "com.squareup.okio:okio:3.3.0"
ktlint = "com.pinterest:ktlint:0.48.2"
junit-bom = "org.junit:junit-bom:5.9.2"
hamcrest = "org.hamcrest:hamcrest-library:2.2"
mockito-core = { module = "org.mockito:mockito-core", version.ref = "mockito" }
mockito-junit = { module = "org.mockito:mockito-junit-jupiter", version.ref = "mockito" }
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
18 changes: 14 additions & 4 deletions gradlew
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
# Darwin, MinGW, and NonStop.
#
# (3) This script is generated from the Groovy template
# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
# within the Gradle project.
#
# You can find Gradle at https://github.com/gradle/gradle/.
Expand All @@ -80,10 +80,10 @@ do
esac
done

APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

APP_NAME="Gradle"
# This is normally unused
# shellcheck disable=SC2034
APP_BASE_NAME=${0##*/}
APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
Expand Down Expand Up @@ -143,12 +143,16 @@ fi
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
case $MAX_FD in #(
max*)
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
MAX_FD=$( ulimit -H -n ) ||
warn "Could not query maximum file descriptor limit"
esac
case $MAX_FD in #(
'' | soft) :;; #(
*)
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
# shellcheck disable=SC3045
ulimit -n "$MAX_FD" ||
warn "Could not set maximum file descriptor limit to $MAX_FD"
esac
Expand Down Expand Up @@ -205,6 +209,12 @@ set -- \
org.gradle.wrapper.GradleWrapperMain \
"$@"

# Stop when "xargs" is not available.
if ! command -v xargs >/dev/null 2>&1
then
die "xargs is not available"
fi

# Use "xargs" to parse quoted args.
#
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
Expand Down
15 changes: 9 additions & 6 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
@rem limitations under the License.
@rem

@if "%DEBUG%" == "" @echo off
@if "%DEBUG%"=="" @echo off
@rem ##########################################################################
@rem
@rem Gradle startup script for Windows
Expand All @@ -25,7 +25,8 @@
if "%OS%"=="Windows_NT" setlocal

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
if "%DIRNAME%"=="" set DIRNAME=.
@rem This is normally unused
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

Expand All @@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome

set JAVA_EXE=java.exe
%JAVA_EXE% -version >NUL 2>&1
if "%ERRORLEVEL%" == "0" goto execute
if %ERRORLEVEL% equ 0 goto execute

echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
Expand Down Expand Up @@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar

:end
@rem End local scope for the variables with windows NT shell
if "%ERRORLEVEL%"=="0" goto mainEnd
if %ERRORLEVEL% equ 0 goto mainEnd

:fail
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
rem the _cmd.exe /c_ return code!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
set EXIT_CODE=%ERRORLEVEL%
if %EXIT_CODE% equ 0 set EXIT_CODE=1
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
exit /b %EXIT_CODE%

:mainEnd
if "%OS%"=="Windows_NT" endlocal
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,10 @@ class ProguardRetraceUnscrambler : UnscrambleSupport<JPanel> {
ReTrace.REGULAR_EXPRESSION2,
allClassNamesSetting,
verboseSetting,
mappingFile
mappingFile,
).retrace(
reader,
writer
writer,
)
buffer.readUtf8()
}
Expand Down Expand Up @@ -120,7 +120,7 @@ class ErrorDialog(project: Project?, private val bundle: ResourceBundle, private
JLabel(
bundle.getString("error_text").format(fileName),
Messages.getWarningIcon(),
SwingConstants.HORIZONTAL
SwingConstants.HORIZONTAL,
).apply {
iconTextGap = 10
preferredSize = Dimension(300, 100)
Expand Down
1 change: 0 additions & 1 deletion src/main/resources/META-INF/plugin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
<id>com.cmgapps.intellij.proguard-retrace-unscambler</id>
<name>Proguard Retrace Unscrambler</name>
<vendor email="support@cmgapps.com" url="https://www.cmgapps.com">CMG Mobile Apps</vendor>
<idea-version since-build="181.4203"/>

<description><![CDATA[Adds Unscrambler support for Proguard's mapping files and Android's R8 mapping files.
Use to de-obfuscate your stacktrace]]></description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,13 @@ class ProguardRetraceUnscramblerShould : BasePlatformTestCase() {
JCheckBox().also {
it.isSelected = false
},
0
0,
)
add(
JCheckBox().also {
it.isSelected = false
},
1
1,
)
}
val stacktrace = classLoader.getResource("stacktrace.txt")?.readText() ?: error("stack.trace not found")
Expand All @@ -89,13 +89,13 @@ class ProguardRetraceUnscramblerShould : BasePlatformTestCase() {
JCheckBox().also {
it.isSelected = true
},
0
0,
)
add(
JCheckBox().also {
it.isSelected = false
},
1
1,
)
}
val stacktrace = classLoader.getResource("stacktrace.txt")?.readText() ?: error("stack.trace not found")
Expand All @@ -112,13 +112,13 @@ class ProguardRetraceUnscramblerShould : BasePlatformTestCase() {
JCheckBox().also {
it.isSelected = false
},
0
0,
)
add(
JCheckBox().also {
it.isSelected = true
},
1
1,
)
}
val stacktrace = classLoader.getResource("stacktrace.txt")?.readText() ?: error("stack.trace not found")
Expand All @@ -135,13 +135,13 @@ class ProguardRetraceUnscramblerShould : BasePlatformTestCase() {
JCheckBox().also {
it.isSelected = true
},
0
0,
)
add(
JCheckBox().also {
it.isSelected = true
},
1
1,
)
}
val stacktrace = classLoader.getResource("stacktrace.txt")?.readText() ?: error("stack.trace not found")
Expand Down Expand Up @@ -171,7 +171,7 @@ class ProguardRetraceUnscramblerShould : BasePlatformTestCase() {
val settingsComponent = ProguardRetraceUnscrambler().createSettingsComponent()
assertThat(
settingsComponent.components.toList(),
hasItems(isA(JCheckBox::class.java))
hasItems(isA(JCheckBox::class.java)),
)
}

Expand Down

0 comments on commit 0da0cfe

Please # to comment.