Skip to content

Commit 318f0d0

Browse files
committed
Update dependencies
1 parent 6278aa5 commit 318f0d0

File tree

6 files changed

+38
-308
lines changed

6 files changed

+38
-308
lines changed

build.gradle

Lines changed: 21 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,68 +1,45 @@
1-
buildscript {
2-
3-
ext.kotlin_version = '1.3.72'
4-
5-
repositories {
6-
mavenCentral()
7-
jcenter()
8-
}
9-
dependencies {
10-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
11-
}
12-
}
13-
141
plugins {
15-
id "org.jetbrains.intellij" version "0.4.16"
2+
id "org.jetbrains.kotlin.jvm" version "1.5.21"
3+
id "org.jetbrains.intellij" version "1.1.4"
164
}
175

18-
sourceCompatibility = 1.8
19-
targetCompatibility = 1.8
20-
21-
22-
23-
apply plugin: 'java'
24-
apply plugin: 'kotlin'
25-
26-
276
repositories {
287
mavenCentral()
29-
jcenter()
308
}
319

32-
sourceSets {
33-
main {
34-
resources {
35-
exclude 'website/adb_operations_popup.png'
36-
exclude 'website/find_actions.png'
37-
exclude 'website/debug_howto.png'
38-
}
39-
}
40-
}
10+
sourceCompatibility = 1.8
11+
targetCompatibility = 1.8
4112

4213
if (!hasProperty('StudioCompilePath')) {
4314
throw new GradleException("No StudioCompilePath value was set, please create gradle.properties file")
4415
}
4516

4617
intellij {
47-
pluginName 'adb_idea'
48-
updateSinceUntilBuild false
18+
pluginName = 'adb_idea'
19+
updateSinceUntilBuild = false
20+
localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
21+
instrumentCode {
22+
compilerVersion = "212.4746.92"
23+
}
24+
instrumentTestCode {
25+
compilerVersion = "212.4746.92"
26+
}
4927

50-
intellij.localPath = project.hasProperty("StudioRunPath") ? StudioRunPath : StudioCompilePath
5128
}
5229

5330
group 'com.developerphil.intellij.plugin.adbidea'
5431

5532
dependencies {
56-
compile "org.jetbrains.kotlin:kotlin-stdlib:${kotlin_version}"
57-
compile "org.jooq:joor-java-8:0.9.7"
33+
implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.5.21'
34+
implementation 'org.jooq:joor-java-8:0.9.14'
5835
compileOnly fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
5936
compileOnly fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
6037

61-
testCompile 'junit:junit:4.12'
62-
testCompile fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
63-
testCompile fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
64-
testCompile "org.mockito:mockito-core:1.+"
65-
testCompile "com.google.truth:truth:1.0.1"
38+
testImplementation 'junit:junit:4.13.2'
39+
testImplementation fileTree(dir: "$StudioCompilePath/plugins/android/lib", include: ['*.jar'])
40+
testImplementation fileTree(dir: "$StudioCompilePath/lib", include: ['*.jar'])
41+
testImplementation "org.mockito:mockito-core:1.+"
42+
testImplementation 'com.google.truth:truth:1.1.3'
6643

6744

6845
}
@@ -78,3 +55,4 @@ task(verifySetup) {
7855

7956

8057
compileJava.dependsOn verifySetup
58+
buildSearchableOptions.enabled = false

gradle/wrapper/gradle-wrapper.jar

508 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

gradlew

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

gradlew.bat

Lines changed: 7 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)