diff --git a/build.gradle b/build.gradle index 0042e81..edf2aeb 100644 --- a/build.gradle +++ b/build.gradle @@ -1,7 +1,7 @@ //http://www.jetbrains.org/intellij/sdk/docs/tutorials/build_system.html buildscript { - ext.kotlin_version = '1.2.21' + ext.kotlin_version = '1.3.72' repositories { maven { url 'http://maven.aliyun.com/nexus/content/repositories/releases/' @@ -14,7 +14,7 @@ buildscript { } plugins { - id "org.jetbrains.intellij" version "0.4.17" + id "org.jetbrains.intellij" version "0.6.3" } apply plugin: 'idea' @@ -31,7 +31,9 @@ repositories { intellij { intellij.updateSinceUntilBuild false - version 'IC-2016.3' + version '201.8743.12' + type 'IC' + plugins = ['com.intellij.java','android', 'java'] } sourceSets { @@ -56,5 +58,11 @@ dependencies { testCompile 'junit:junit:4.12' testCompile 'org.hamcrest:hamcrest-library:1.3' - compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version" + compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" +} + +runIde { + // Absolute path to installed target 3.5 Android Studio to use as IDE Development Instance + // The "Contents" directory is macOS specific. + ideDirectory '/Applications/Android Studio.app/Contents' } \ No newline at end of file diff --git a/resources/META-INF/plugin.xml b/resources/META-INF/plugin.xml index 26a2e4f..9643ee1 100644 --- a/resources/META-INF/plugin.xml +++ b/resources/META-INF/plugin.xml @@ -1,8 +1,8 @@ com.moxun.plugin.s2v SVG2VectorDrawable - 1.8.2 - 20 + 1.8.3 + 21 moxun 1.8.3
+ Fix compatible issue with Android Studio 4.1. (#51,#54)
+ New icon. (#52)
1.8.2
Fix compatible issue with Android Studio 3.6+. (#47,#48)
Fix incorrect output name when source file name with numbers. (#46)
@@ -73,6 +76,8 @@ + org.jetbrains.android + com.intellij.modules.java @@ -92,7 +97,7 @@ + description="Tool for transforming SVG to VectorDrawable" icon="/icons/s2v_icon_16.svg"> diff --git a/resources/icons/menu-open.png b/resources/icons/menu-open.png new file mode 100644 index 0000000..6ca21ad Binary files /dev/null and b/resources/icons/menu-open.png differ diff --git a/resources/icons/icon.png b/resources/icons/s2v_icon.png similarity index 100% rename from resources/icons/icon.png rename to resources/icons/s2v_icon.png diff --git a/resources/icons/s2v_icon.svg b/resources/icons/s2v_icon.svg new file mode 100644 index 0000000..d97519e --- /dev/null +++ b/resources/icons/s2v_icon.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/resources/icons/s2v_icon_16.svg b/resources/icons/s2v_icon_16.svg new file mode 100644 index 0000000..db8bf9d --- /dev/null +++ b/resources/icons/s2v_icon_16.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/src/com/moxun/s2v/GUI.form b/src/com/moxun/s2v/GUI.form index 3d0c71e..9b93253 100644 --- a/src/com/moxun/s2v/GUI.form +++ b/src/com/moxun/s2v/GUI.form @@ -3,16 +3,18 @@ - + - + - + + + @@ -22,40 +24,37 @@ - + - + - + - + - - - - + + + + - - - - + + + - - - + @@ -63,10 +62,10 @@ - + - + @@ -81,7 +80,7 @@ - + @@ -89,7 +88,7 @@ - + @@ -105,9 +104,11 @@ - + + +