diff --git a/build.gradle b/build.gradle
index 440624d..8715254 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,11 +3,9 @@ apply plugin: 'maven'
 
 group = 'com.codeborne'
 archivesBaseName = 'mobileid'
-version = '0.9.6-SNAPSHOT'
-sourceCompatibility = 1.5
-targetCompatibility = 1.5
+version = '1.0'
 
-defaultTasks 'clean', 'copy-libs', 'copy-test-libs', 'test', 'install'
+defaultTasks 'clean', 'test', 'install'
 
 repositories{
   mavenCentral()
@@ -26,6 +24,9 @@ sourceSets {
   }
 }
 
+sourceCompatibility = 1.6
+targetCompatibility = 1.6
+
 compileJava.options.debugOptions.debugLevel = "source,lines,vars"
 [compileJava, compileTestJava, javadoc]*.options.collect {options ->
   options.encoding = 'UTF-8'
@@ -43,23 +44,21 @@ compileJava.options.debugOptions.debugLevel = "source,lines,vars"
 dependencies {
   compile 'org.apache.axis:axis:1.4'
   compile 'org.apache.axis:axis-jaxrpc:1.4'
-  compile 'commons-discovery:commons-discovery:0.4'
-  compile 'wsdl4j:wsdl4j:1.6.2'
-  testCompile 'junit:junit:4.11'
-  testCompile 'org.hamcrest:hamcrest-all:1.3'
-  testCompile 'org.mockito:mockito-all:1.9.5'
+  compile 'commons-discovery:commons-discovery:0.5'
+  compile 'wsdl4j:wsdl4j:1.6.3'
+  testCompile 'junit:junit:4.12'
+  testCompile 'org.hamcrest:hamcrest-core:1.3'
+  testCompile 'org.mockito:mockito-all:1.10.19'
 }
 
-task 'copy-libs'(type: Sync) {
+task libs(type: Sync) {
   from configurations.compile
-  into "$buildDir/libs"
-}
-
-task 'copy-test-libs'(type: Sync) {
   from configurations.testCompile
-  into "$buildDir/libs-test"
+  into "$buildDir/lib"
 }
 
+compileJava.dependsOn libs
+
 task sourcesJar(type: Jar, dependsOn:classes) {
   classifier = 'sources'
   from sourceSets.main.allSource
@@ -77,7 +76,7 @@ artifacts {
 }
 
 task wrapper(type: Wrapper) {
-  gradleVersion = '2.1'
+  gradleVersion = '2.5'
   jarFile = './gradle-wrapper/gradle-wrapper.jar'
   scriptFile = './gradle'
 }
diff --git a/deploy.gradle b/deploy.gradle
index 04d12bf..e868c7a 100644
--- a/deploy.gradle
+++ b/deploy.gradle
@@ -12,8 +12,9 @@ uploadArchives {
         mavenDeployer {
             beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-            repository(url: "https://oss.sonatype.org/content/repositories/snapshots") {
-//              repository(url: "https://oss.sonatype.org/service/local/staging/deploy/maven2") {
+            repository(url: project.version.endsWith("-SNAPSHOT") ?
+                            'https://oss.sonatype.org/content/repositories/snapshots/' :
+                            'https://oss.sonatype.org/service/local/staging/deploy/maven2/') {
               authentication(userName: "$sonatypeUsername", password: "$sonatypePassword")
             }
 
diff --git a/gradle-wrapper/gradle-wrapper.properties b/gradle-wrapper/gradle-wrapper.properties
index 65e06ad..b54a203 100644
--- a/gradle-wrapper/gradle-wrapper.properties
+++ b/gradle-wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-bin.zip
+distributionUrl=http\://services.gradle.org/distributions/gradle-2.5-bin.zip
diff --git a/test/com/codeborne/security/mobileid/MobileIDAuthenticatorTest.java b/test/com/codeborne/security/mobileid/MobileIDAuthenticatorTest.java
index 97623e8..2e49d6a 100644
--- a/test/com/codeborne/security/mobileid/MobileIDAuthenticatorTest.java
+++ b/test/com/codeborne/security/mobileid/MobileIDAuthenticatorTest.java
@@ -13,7 +13,7 @@
 
 import static com.codeborne.security.AuthenticationException.Code.*;
 import static java.lang.String.valueOf;
-import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.CoreMatchers.equalTo;
 import static org.junit.Assert.*;
 import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.*;