diff --git a/server/.idea/libraries/Gradle__io_netty_netty_all_4_1_2_Final.xml b/server/.idea/libraries/Gradle__io_netty_netty_all_4_1_2_Final.xml new file mode 100644 index 00000000000..9f66e77ee92 --- /dev/null +++ b/server/.idea/libraries/Gradle__io_netty_netty_all_4_1_2_Final.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/server/.idea/misc.xml b/server/.idea/misc.xml index 8d8dc8d4816..ee2a58cb493 100644 --- a/server/.idea/misc.xml +++ b/server/.idea/misc.xml @@ -3,13 +3,6 @@ - - - diff --git a/server/.idea/modules/server.iml b/server/.idea/modules/server.iml index 3f29ea4f96c..2c3048b623a 100644 --- a/server/.idea/modules/server.iml +++ b/server/.idea/modules/server.iml @@ -20,5 +20,6 @@ + \ No newline at end of file diff --git a/server/build.gradle b/server/build.gradle index 30a02373729..e7cd55b54e3 100644 --- a/server/build.gradle +++ b/server/build.gradle @@ -23,5 +23,6 @@ repositories { dependencies { compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version" + compile "io.netty:netty-all:4.1.2.Final" testCompile group: 'junit', name: 'junit', version: '4.11' } diff --git a/server/gradle/wrapper/gradle-wrapper.properties b/server/gradle/wrapper/gradle-wrapper.properties index 7eb6cfad8d3..9cb57388875 100644 --- a/server/gradle/wrapper/gradle-wrapper.properties +++ b/server/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Jul 26 11:06:50 MSK 2016 +#Tue Jul 26 11:24:10 MSK 2016 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.9-all.zip