Skip to content

Commit

Permalink
Merge pull request #142 from Turbo87/update-gradle
Browse files Browse the repository at this point in the history
Update Gradle and IntelliJ plugin
  • Loading branch information
Turbo87 authored Jun 7, 2017
2 parents 15b7229 + e5924f4 commit 4d92062
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 6 deletions.
6 changes: 2 additions & 4 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
buildscript {
ext {
intellijGradlePluginSHA1 = '050a415'

javaVersion = '1.7'
kotlinVersion = '1.0.5'

Expand All @@ -19,11 +17,11 @@ buildscript {

dependencies {
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
classpath "com.github.JetBrains:gradle-intellij-plugin:$intellijGradlePluginSHA1"
}
}

plugins {
id "org.jetbrains.intellij" version "0.2.11"
id "com.zoltu.git-versioning" version "2.0.28"
}

Expand Down Expand Up @@ -53,7 +51,7 @@ intellij {

sandboxDirectory = project.rootDir.canonicalPath + "/.sandbox"

publish {
publishPlugin {
username "$JETBRAINS_USERNAME"
password "$JETBRAINS_PASSWORD"
}
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Fri Dec 23 17:39:04 CET 2016
#Wed Jun 07 22:24:42 CEST 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.2.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

0 comments on commit 4d92062

Please sign in to comment.