diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 99f9d49..c6d84e0 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -29,10 +29,10 @@ jobs: restore-keys: | ${{ runner.os }}-gradle- - - name: Set up JDK 1.8 + - name: Set up JDK 11 uses: actions/setup-java@v1 with: - java-version: 1.8 + java-version: 11 - name: Grant execute permission for gradlew run: chmod +x gradlew @@ -67,6 +67,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} + JAVA_HOME: '' # Avoid 'java: not found' error - name: Build plugin run: ./gradlew buildPlugin @@ -76,22 +77,9 @@ jobs: path: build/distributions - name: Check plugin compatibility - uses: ChrisCarini/intellij-platform-plugin-verifier-action@v0.0.2 + uses: ChrisCarini/intellij-platform-plugin-verifier-action@v1.0.3 with: - ide-versions: | - ideaIC:2020.1 - ideaIU:2020.1 - clion:2020.1 - goland:2020.1 - pycharmPC:2020.1 - pycharmPY:2020.1 - riderRD:2020.1 - ideaIC:LATEST-EAP-SNAPSHOT - ideaIU:LATEST-EAP-SNAPSHOT - clion:LATEST-EAP-SNAPSHOT - goland:LATEST-EAP-SNAPSHOT - pycharmPC:LATEST-EAP-SNAPSHOT - pycharmPY:LATEST-EAP-SNAPSHOT + ide-versions: .github/workflows/ide_versions_file.txt - uses: nowsprinting/check-version-format-action@v1 id: version diff --git a/.github/workflows/ide_versions_file.txt b/.github/workflows/ide_versions_file.txt new file mode 100644 index 0000000..6c59d1a --- /dev/null +++ b/.github/workflows/ide_versions_file.txt @@ -0,0 +1,3 @@ +ideaIC:2020.3 +goland:2020.3 +riderRD:2020.3 diff --git a/.idea/copyright/Apache_2_0.xml b/.idea/copyright/Apache_2_0.xml index 70fc9e1..9024ab0 100644 --- a/.idea/copyright/Apache_2_0.xml +++ b/.idea/copyright/Apache_2_0.xml @@ -1,6 +1,6 @@ - \ No newline at end of file diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml new file mode 100644 index 0000000..0631674 --- /dev/null +++ b/.idea/kotlinc.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 53d762f..16d54e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,5 @@ ## Unreleased +- Support for 2020.3 ## 1.0.2 - Fix meta wording diff --git a/LICENSE b/LICENSE index c253842..776ea87 100644 --- a/LICENSE +++ b/LICENSE @@ -187,7 +187,7 @@ same "printed page" as the copyright notice for easier identification within third-party archives. - Copyright 2020 Koji Hasegawa + Copyright 2020-2021 Koji Hasegawa Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/build.gradle.kts b/build.gradle.kts index 1cc9917..69b474d 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -1,11 +1,11 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ plugins { - id("org.jetbrains.intellij") version "0.4.21" + id("org.jetbrains.intellij") version "0.6.5" java - kotlin("jvm") version "1.3.71" + kotlin("jvm") version "1.4.21" id("com.palantir.git-version") version "0.12.3" jacoco id("io.gitlab.arturbosch.detekt") version "1.11.0" @@ -38,7 +38,7 @@ dependencies { // See https://github.com/JetBrains/gradle-intellij-plugin/ intellij { - version = "LATEST-EAP-SNAPSHOT" + version = "2020.3" setPlugins("git4idea") } configure { @@ -53,12 +53,19 @@ detekt { } } tasks { - compileKotlin { - kotlinOptions.jvmTarget = "1.8" + // Set the compatibility versions to 1.8 + withType { + sourceCompatibility = "1.8" + targetCompatibility = "1.8" } - compileTestKotlin { + withType { kotlinOptions.jvmTarget = "1.8" } + + withType { + jvmTarget = "1.8" + } + test { useJUnitPlatform { includeEngines("junit-jupiter") @@ -81,7 +88,7 @@ tasks.getByName("patchPluginXml changeNotes( changeNotesFromChangeLog() ) - sinceBuild("201.6668.121") + sinceBuild("203") untilBuild(null) } diff --git a/gradle.properties b/gradle.properties index 29e08e8..46ede00 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1,5 @@ +# +# Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +# + kotlin.code.style=official \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738c..e708b1c 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 44e7c4d..223b72e 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,9 @@ +# +# Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +# + distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-5.2.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..4f906e0 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # 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"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..107acd3 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,15 +29,18 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if "%ERRORLEVEL%" == "0" goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,28 +64,14 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell diff --git a/settings.gradle.kts b/settings.gradle.kts index cb14295..2ed6be6 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -1,2 +1,6 @@ +/* + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + */ + rootProject.name = "intellij-mob" diff --git a/src/main/java/com/nowsprinting/intellij_mob/MobBundle.java b/src/main/java/com/nowsprinting/intellij_mob/MobBundle.java index f8bb914..ed2f80b 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/MobBundle.java +++ b/src/main/java/com/nowsprinting/intellij_mob/MobBundle.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob; diff --git a/src/main/java/com/nowsprinting/intellij_mob/action/done/ui/DoneDialog.java b/src/main/java/com/nowsprinting/intellij_mob/action/done/ui/DoneDialog.java index fa6913a..567d1ef 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/action/done/ui/DoneDialog.java +++ b/src/main/java/com/nowsprinting/intellij_mob/action/done/ui/DoneDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.done.ui; diff --git a/src/main/java/com/nowsprinting/intellij_mob/action/next/ui/NextDialog.java b/src/main/java/com/nowsprinting/intellij_mob/action/next/ui/NextDialog.java index 8061aff..132d89a 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/action/next/ui/NextDialog.java +++ b/src/main/java/com/nowsprinting/intellij_mob/action/next/ui/NextDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.next.ui; diff --git a/src/main/java/com/nowsprinting/intellij_mob/action/reset/ui/ResetDialog.java b/src/main/java/com/nowsprinting/intellij_mob/action/reset/ui/ResetDialog.java index 788f741..c077f36 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/action/reset/ui/ResetDialog.java +++ b/src/main/java/com/nowsprinting/intellij_mob/action/reset/ui/ResetDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.reset.ui; diff --git a/src/main/java/com/nowsprinting/intellij_mob/action/start/ui/StartDialog.java b/src/main/java/com/nowsprinting/intellij_mob/action/start/ui/StartDialog.java index 5d39c1c..e2883ff 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/action/start/ui/StartDialog.java +++ b/src/main/java/com/nowsprinting/intellij_mob/action/start/ui/StartDialog.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.start.ui; diff --git a/src/main/java/com/nowsprinting/intellij_mob/config/MobProjectSettings.java b/src/main/java/com/nowsprinting/intellij_mob/config/MobProjectSettings.java index dabc5de..b5a47bc 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/config/MobProjectSettings.java +++ b/src/main/java/com/nowsprinting/intellij_mob/config/MobProjectSettings.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config; diff --git a/src/main/java/com/nowsprinting/intellij_mob/config/MobSettingsConfigurable.java b/src/main/java/com/nowsprinting/intellij_mob/config/MobSettingsConfigurable.java index 016e579..81a506d 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/config/MobSettingsConfigurable.java +++ b/src/main/java/com/nowsprinting/intellij_mob/config/MobSettingsConfigurable.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config; diff --git a/src/main/java/com/nowsprinting/intellij_mob/config/ui/MobSettingsForm.java b/src/main/java/com/nowsprinting/intellij_mob/config/ui/MobSettingsForm.java index 5e142b5..1adc5a7 100644 --- a/src/main/java/com/nowsprinting/intellij_mob/config/ui/MobSettingsForm.java +++ b/src/main/java/com/nowsprinting/intellij_mob/config/ui/MobSettingsForm.java @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config.ui; diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneAction.kt index 391af54..167fea1 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.done diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneNotificationAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneNotificationAction.kt index 7e74260..3d2cb86 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneNotificationAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneNotificationAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.done diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DonePrecondition.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DonePrecondition.kt index 1ed59cd..88281b1 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DonePrecondition.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DonePrecondition.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.done diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneTask.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneTask.kt index 3cec8bd..855e462 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneTask.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/DoneTask.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.done diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/GitCommitAndPushExecutorHelper.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/GitCommitAndPushExecutorHelper.kt index b8e70db..2604534 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/GitCommitAndPushExecutorHelper.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/done/GitCommitAndPushExecutorHelper.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.done diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextAction.kt index 2f838ee..7fc3a61 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.next diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextNotificationAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextNotificationAction.kt index f087e48..78fd7f6 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextNotificationAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextNotificationAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.next diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextPrecondition.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextPrecondition.kt index 8c18bad..c9fb2bd 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextPrecondition.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextPrecondition.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.next diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextTask.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextTask.kt index 2c90e48..372a5b0 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextTask.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/next/NextTask.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.next diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetAction.kt index a1357db..0490c9f 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.reset diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetPrecondition.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetPrecondition.kt index ad67118..7a605c7 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetPrecondition.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetPrecondition.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.reset diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetTask.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetTask.kt index 08e1278..4e3124e 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetTask.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/reset/ResetTask.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.reset diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/share/ShareAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/share/ShareAction.kt index eb8a2d2..a8f782f 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/share/ShareAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/share/ShareAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.share diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartAction.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartAction.kt index ada7edf..9baa483 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartAction.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartAction.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.start diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartPrecondition.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartPrecondition.kt index 420019d..bdba73b 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartPrecondition.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartPrecondition.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.start diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartTask.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartTask.kt index 69bf34a..d93c61b 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartTask.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/action/start/StartTask.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.start diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtension.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtension.kt index 99abc28..cdbbf86 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtension.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Add.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Add.kt index a1f94ea..9315a7a 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Add.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Add.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Branch.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Branch.kt index c52dc90..e00ed52 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Branch.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Branch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Checkout.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Checkout.kt index 7552411..e4da7b7 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Checkout.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Checkout.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Commit.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Commit.kt index 561082e..3815291 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Commit.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Commit.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Config.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Config.kt index c9fea3d..b026222 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Config.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Config.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Diff.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Diff.kt index 39ca738..f41487e 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Diff.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Diff.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Fetch.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Fetch.kt index e89b2cb..c4259c6 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Fetch.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Fetch.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitCommandUtil.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitCommandUtil.kt index 64e37c2..cabd526 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitCommandUtil.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitCommandUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtension.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtension.kt index 4c84ed5..aabfff6 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtension.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtension.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtension.kt index aee4a41..4c2a729 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtension.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtension.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtil.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtil.kt index 9ebc6ec..0aa4204 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtil.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtil.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Log.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Log.kt index ee957f5..0ae44d1 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Log.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Log.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Merge.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Merge.kt index 906de06..3c3f814 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Merge.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Merge.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Pull.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Pull.kt index 4ecb949..3e724b5 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Pull.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Pull.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Push.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Push.kt index 5ae3927..6181ad6 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Push.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Push.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Status.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Status.kt index 4acae7c..36397cf 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/git/Status.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/git/Status.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerListener.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerListener.kt index ac29eec..4e997d0 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerListener.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerListener.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.timer diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerService.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerService.kt index 0c5ca04..66e7418 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerService.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/TimerService.kt @@ -1,11 +1,10 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.timer -import com.intellij.notification.NotificationDisplayType -import com.intellij.notification.NotificationGroup +import com.intellij.notification.NotificationGroupManager import com.intellij.notification.NotificationType import com.intellij.openapi.components.ServiceManager import com.intellij.openapi.diagnostic.Logger @@ -110,7 +109,7 @@ class TimerService { } private fun notifyExpire() { - val stickyGroup = NotificationGroup("Mob Timer", NotificationDisplayType.STICKY_BALLOON, false) + val stickyGroup = NotificationGroupManager.getInstance().getNotificationGroup("Mob Timer") val notification = stickyGroup.createNotification( MobBundle.message("mob.timer.expired.title"), NotificationType.INFORMATION diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidget.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidget.kt index a3a7708..b22aad3 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidget.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidget.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.timer.statusbar @@ -12,11 +12,11 @@ import com.intellij.openapi.wm.StatusBarWidget.MultipleTextValuesPresentation import com.intellij.openapi.wm.StatusBarWidget.WidgetPresentation import com.intellij.openapi.wm.impl.status.EditorBasedWidget import com.intellij.util.Consumer +import com.intellij.util.concurrency.annotations.RequiresEdt import com.nowsprinting.intellij_mob.MobBundle import com.nowsprinting.intellij_mob.timer.TimerListener import com.nowsprinting.intellij_mob.timer.TimerService import com.nowsprinting.intellij_mob.timer.TimerState -import org.jetbrains.annotations.CalledInAwt import java.awt.event.MouseEvent import javax.swing.Icon @@ -87,7 +87,7 @@ class TimerWidget(project: Project) : EditorBasedWidget(project), MultipleTextVa update() } - @CalledInAwt + @RequiresEdt private fun update() { if (project.isDisposed) return myStatusBar.updateWidget(ID()) diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidgetFactory.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidgetFactory.kt index 569b464..b5ff50f 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidgetFactory.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/timer/statusbar/TimerWidgetFactory.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.timer.statusbar diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/util/Notification.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/util/Notification.kt index 171c7d8..6306c6e 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/util/Notification.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/util/Notification.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.util @@ -7,7 +7,7 @@ package com.nowsprinting.intellij_mob.util import com.intellij.notification.* import com.intellij.openapi.project.Project -private val NOTIFICATION_GROUP = NotificationGroup.balloonGroup("Mob") +private val NOTIFICATION_GROUP = NotificationGroupManager.getInstance().getNotificationGroup("Mob") /** * Notify information level message diff --git a/src/main/kotlin/com/nowsprinting/intellij_mob/util/Status.kt b/src/main/kotlin/com/nowsprinting/intellij_mob/util/Status.kt index 6f5a27f..0a519f8 100644 --- a/src/main/kotlin/com/nowsprinting/intellij_mob/util/Status.kt +++ b/src/main/kotlin/com/nowsprinting/intellij_mob/util/Status.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.util diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index 6bd28ff..c2addfc 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -1,5 +1,5 @@ @@ -40,6 +40,8 @@ id="com.nowsprinting.intellij_mob.TimerWidget" implementation="com.nowsprinting.intellij_mob.timer.statusbar.TimerWidgetFactory" order="before gitWidget"/> + + @@ -61,7 +63,7 @@ - + diff --git a/src/main/resources/com/nowsprinting/intellij_mob/MobBundle.properties b/src/main/resources/com/nowsprinting/intellij_mob/MobBundle.properties index ce8b9f4..59a8543 100644 --- a/src/main/resources/com/nowsprinting/intellij_mob/MobBundle.properties +++ b/src/main/resources/com/nowsprinting/intellij_mob/MobBundle.properties @@ -1,5 +1,5 @@ # -# Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. +# Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. # # Settings (Preferences) diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/action/next/NextPreconditionKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/action/next/NextPreconditionKtTest.kt index bde759f..bbcef51 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/action/next/NextPreconditionKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/action/next/NextPreconditionKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.next diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/action/start/StartPreconditionKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/action/start/StartPreconditionKtTest.kt index 006899a..fd7a427 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/action/start/StartPreconditionKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/action/start/StartPreconditionKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.action.start @@ -21,6 +21,7 @@ import git4idea.repo.GitRemote import io.mockk.every import io.mockk.mockkStatic import org.junit.jupiter.api.Assertions.* +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test internal class StartPreconditionKtTest { @@ -245,6 +246,7 @@ internal class StartPreconditionKtTest { assertEquals(MobBundle.message("mob.validate_reason.has_uncommitted_changes"), errorMessage) } + @Disabled("ApplicationManager.getApplication() returns null in tests. Since 2020.3") @Test fun checkStartPrecondition_hasUncommittedChanges_failure() { val settings = createSettings() diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtensionKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtensionKtTest.kt index 90d3c39..d087b5b 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtensionKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsExtensionKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsTest.kt index 2247cbe..f309b66 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/config/MobProjectSettingsTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/config/ui/MobSettingsFormTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/config/ui/MobSettingsFormTest.kt index 98382ff..e440b92 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/config/ui/MobSettingsFormTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/config/ui/MobSettingsFormTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.config.ui diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtensionKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtensionKtTest.kt index 4fe3c73..7f6b757 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtensionKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitLocalBranchExtensionKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtensionKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtensionKtTest.kt index c5ba892..2cb12aa 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtensionKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryExtensionKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtilKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtilKtTest.kt index 9bda37f..4035c36 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtilKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/git/GitRepositoryUtilKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/git/LogKtTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/git/LogKtTest.kt index 5c60b3c..74dceb7 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/git/LogKtTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/git/LogKtTest.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.git diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyChangeListManager.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyChangeListManager.kt index a3e102b..4c47532 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyChangeListManager.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyChangeListManager.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble @@ -32,6 +32,10 @@ open class DummyChangeListManager : ChangeListManager() { throw Exception("Not yet implemented") } + override fun getStatus(file: FilePath): FileStatus { + TODO("Not yet implemented") + } + override fun getAffectedPaths(): MutableList { throw Exception("Not yet implemented") } @@ -68,6 +72,10 @@ open class DummyChangeListManager : ChangeListManager() { throw Exception("Not yet implemented") } + override fun getUnversionedFilesPaths(): MutableList { + TODO("Not yet implemented") + } + override fun getDefaultListName(): String { throw Exception("Not yet implemented") } @@ -104,6 +112,10 @@ open class DummyChangeListManager : ChangeListManager() { throw Exception("Not yet implemented") } + override fun getIgnoredFilePaths(): MutableList { + TODO("Not yet implemented") + } + override fun addFilesToIgnore(vararg ignoredFiles: IgnoredFileBean?) { throw Exception("Not yet implemented") } @@ -163,6 +175,10 @@ open class DummyChangeListManager : ChangeListManager() { throw Exception("Not yet implemented") } + override fun areChangeListsEnabled(): Boolean { + TODO("Not yet implemented") + } + override fun haveChangesUnder(vf: VirtualFile): ThreeState { throw Exception("Not yet implemented") } diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyGitRepository.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyGitRepository.kt index a591ffb..bfe5315 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyGitRepository.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyGitRepository.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyHash.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyHash.kt index 2d21b3d..7203c42 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyHash.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyHash.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyProject.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyProject.kt index 7e05f3a..72a0130 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyProject.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyProject.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyVirtualFile.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyVirtualFile.kt index e0a071f..7c067bd 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyVirtualFile.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/DummyVirtualFile.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeChange.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeChange.kt index 3f41172..75fa387 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeChange.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeChange.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeLogger.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeLogger.kt index 1bf4317..25fcc63 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeLogger.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/testdouble/FakeLogger.kt @@ -1,5 +1,5 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.testdouble diff --git a/src/test/kotlin/com/nowsprinting/intellij_mob/timer/TimerServiceTest.kt b/src/test/kotlin/com/nowsprinting/intellij_mob/timer/TimerServiceTest.kt index 8227523..d9276c2 100644 --- a/src/test/kotlin/com/nowsprinting/intellij_mob/timer/TimerServiceTest.kt +++ b/src/test/kotlin/com/nowsprinting/intellij_mob/timer/TimerServiceTest.kt @@ -1,15 +1,17 @@ /* - * Copyright 2020 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. + * Copyright 2020-2021 Koji Hasegawa. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. */ package com.nowsprinting.intellij_mob.timer import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Assertions.assertFalse +import org.junit.jupiter.api.Disabled import org.junit.jupiter.api.Test import java.time.LocalDateTime import java.time.Month +@Disabled("ApplicationManager.getApplication() returns null in tests. Since 2020.3") internal class TimerServiceTest { private val startTime = LocalDateTime.of(2020, Month.DECEMBER, 31, 23, 55, 30) private val verifyTime = LocalDateTime.of(2021, Month.JANUARY, 1, 0, 1, 10)