From 435a9585cfbb2e3e90fc0e28fa1b917b8b90f4cd Mon Sep 17 00:00:00 2001 From: longforus Date: Wed, 3 Apr 2019 22:41:24 +0800 Subject: [PATCH] check --- build.gradle | 18 +++++++++--------- gradle.properties.change_me | 15 +++++++++++++++ src/main/resources/META-INF/plugin.xml | 8 ++++---- 3 files changed, 28 insertions(+), 13 deletions(-) create mode 100644 gradle.properties.change_me diff --git a/build.gradle b/build.gradle index 81a4c60..4ad1bba 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { - ext.kotlin_version = '1.1.3' + ext.kotlin_version = '1.2.50' repositories { mavenCentral() @@ -53,18 +53,18 @@ intellij { group 'com.developerphil.intellij.plugin.adbidea' dependencies { - compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" - compile "org.jetbrains.kotlin:kotlin-runtime:${kotlin_version}" + implementation "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}" + implementation "org.jetbrains.kotlin:kotlin-runtime:${kotlin_version}" compileOnly fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar']) compileOnly fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar']) - compile 'com.google.dagger:dagger:2.6' + implementation 'com.google.dagger:dagger:2.6' kapt "com.google.dagger:dagger-compiler:2.6" - testCompile 'junit:junit:4.12' - testCompile fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar']) - testCompile fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar']) - testCompile "org.mockito:mockito-core:1.+" - testCompile "com.google.truth:truth:0.30" + testImplementation 'junit:junit:4.12' + testImplementation fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar']) + testImplementation fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar']) + testImplementation "org.mockito:mockito-core:1.+" + testImplementation "com.google.truth:truth:0.30" } diff --git a/gradle.properties.change_me b/gradle.properties.change_me new file mode 100644 index 0000000..91c5847 --- /dev/null +++ b/gradle.properties.change_me @@ -0,0 +1,15 @@ +# Copy this file as gradle.properties +# It will be used for both compiling and running the adb-idea plugin. + + +# Path to a downloaded instance of Android Studio +# This is used to add the android plugin dependencies to the project. +# must point to the latest version of Android Studio. +# You'll know it's right if you can find "$StudioCompilePath/lib/idea.jar" +StudioCompilePath=/Applications/Android Studio.app/Contents + + +# Determines which IDE to run when using the "./gradlew runIdea" command. +# This is useful to test the plugin on older versions of Android Studio or Intellij +# Default value: $StudioCompilePath +#StudioRunPath=/Applications/Android Studio.app/Contents \ No newline at end of file diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml index e76d6b8..b92f728 100644 --- a/src/main/resources/META-INF/plugin.xml +++ b/src/main/resources/META-INF/plugin.xml @@ -2,7 +2,7 @@ com.developerphil.adbidea ADB Idea 1.6.3 - Philippe Breault + Philippe Breault and Void Young @@ -28,15 +28,15 @@ There are two basic ways to invoke a command: ]]> 1.6.3 -