version 2.0.2

VKCOM · Feb 21, 2019 · 9baba54 · 9baba54
1 parent ae85d41
commit 9baba54
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 70 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -1,6 +1,6 @@
 ext.sdkVersions = [
-        code                            : '10',
-        name                            : '2.0.1',
+        code                            : '11',
+        name                            : '2.0.2',
 
         minSdk                          : 16,
         targetSdk                       : 26,

diff --git a/publish.gradle b/publish.gradle
@@ -45,90 +45,88 @@ if (System.getenv('SDK_UPDATE') == "1") {
 
     def sonatypeRepositoryUrl = getRepoUrl()
 
-        uploadArchives {
-            repositories {
-                mavenDeployer {
-                    beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
+    uploadArchives {
+        repositories {
+            mavenDeployer {
+                beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
 
-                    pom.artifactId = sdkPublish.POM_ARTIFACT_ID
+                pom.artifactId = sdkPublish.POM_ARTIFACT_ID
 
-                    repository(url: sonatypeRepositoryUrl) {
-                        authentication(userName: getRepoUsername(), password: getRepoPassword())
-                    }
-
-                    pom.project {
-                        packaging 'aar'
+                repository(url: sonatypeRepositoryUrl) {
+                    authentication(userName: getRepoUsername(), password: getRepoPassword())
+                }
 
-                        name sdkPublish.POM_NAME
-                        description sdkPublish.POM_DESCRIPTION
-                        url sdkPublish.POM_URL
+                pom.project {
+                    packaging 'aar'
+                    name sdkPublish.POM_NAME
+                    description sdkPublish.POM_DESCRIPTION
+                    url sdkPublish.POM_URL
 
-                        scm {
-                            url sdkPublish.POM_SCM_URL
-                            connection sdkPublish.POM_SCM_CONNECTION
-                            developerConnection sdkPublish.POM_SCM_DEV_CONNECTION
-                        }
+                    scm {
+                        url sdkPublish.POM_SCM_URL
+                        connection sdkPublish.POM_SCM_CONNECTION
+                        developerConnection sdkPublish.POM_SCM_DEV_CONNECTION
+                    }
 
-                        licenses {
-                            license {
-                                name "MIT"
-                                url sdkPublish.POM_LICENCE_URL
-                                distribution 'repo'
-                            }
+                    licenses {
+                        license {
+                            name "MIT"
+                            url sdkPublish.POM_LICENCE_URL
+                            distribution 'repo'
                         }
+                    }
 
-                        developers {
-                            developer {
-                                id "vk"
-                                name "vk.com"
-                            }
+                    developers {
+                        developer {
+                            id "vk"
+                            name "vk.com"
                         }
                     }
                 }
             }
         }
+    }
 
-        task sourcesJar(type: Jar) {
-            from android.sourceSets.main.java.srcDirs
-            classifier = 'sources'
-        }
+    task sourcesJar(type: Jar) {
+        from android.sourceSets.main.java.srcDirs
+        classifier = 'sources'
+    }
 
-        task javadoc(type: Javadoc) {
-            excludes = ['**/**']
-            source = android.sourceSets.main.java.srcDirs
-            classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
-            classpath += configurations.javadocDeps
-        }
+    task javadoc(type: Javadoc) {
+        excludes = ['**/**']
+        source = android.sourceSets.main.java.srcDirs
+        classpath += project.files(android.getBootClasspath().join(File.pathSeparator))
+        classpath += configurations.javadocDeps
+    }
 
-        task javadocJar(type: Jar, dependsOn: javadoc) {
-            classifier = 'javadoc'
-            from javadoc.destinationDir
-        }
+    task javadocJar(type: Jar, dependsOn: javadoc) {
+        classifier = 'javadoc'
+        from javadoc.destinationDir
+    }
 
-        signing {
-            println("Signing SDK...")
-            required { gradle.taskGraph.hasTask("uploadArchives") }
-            sign configurations.archives
-        }
+    signing {
+        println("Signing SDK...")
+        required { gradle.taskGraph.hasTask("uploadArchives") }
+        sign configurations.archives
+    }
 
-        artifacts {
-            archives javadocJar
-            archives sourcesJar
-        }
+    artifacts {
+        archives javadocJar
+        archives sourcesJar
     }
+}
 
-    gradle.taskGraph.whenReady { taskGraph ->
-        if (taskGraph.allTasks.any { it instanceof Sign }) {
-            println("Signing config reading...")
-            def id = System.getenv('PGP_KEY_ID')
-            def password = System.getenv('PGP_KEY_PASS')
-            def file = System.getenv('PGP_KEY_PATH')
-
-            allprojects {
-                ext."signing.keyId" = id
-                ext."signing.password" = password
-                ext."signing.secretKeyRingFile" = file
-            }
+gradle.taskGraph.whenReady { taskGraph ->
+    if (taskGraph.allTasks.any { it instanceof Sign }) {
+        println("Signing config reading...")
+        def id = System.getenv('PGP_KEY_ID')
+        def password = System.getenv('PGP_KEY_PASS')
+        def file = System.getenv('PGP_KEY_PATH')
+
+        allprojects {
+            ext."signing.keyId" = id
+            ext."signing.password" = password
+            ext."signing.secretKeyRingFile" = file
         }
     }
-//}
+}
diff --git a/samples/app/src/main/java/com/vk/sdk/sample/WelcomeActivity.kt b/samples/app/src/main/java/com/vk/sdk/sample/WelcomeActivity.kt
@@ -32,7 +32,6 @@ import android.widget.Button
 import com.vk.api.sdk.VK
 import com.vk.api.sdk.auth.VKAccessToken
 import com.vk.api.sdk.auth.VKAuthCallback
-import com.vk.api.sdk.auth.VKAuthParams
 import com.vk.api.sdk.auth.VKScope
 
 class WelcomeActivity: Activity() {
@@ -62,7 +61,7 @@ class WelcomeActivity: Activity() {
             override fun onLoginFailed(errorCode: Int) {
             }
         }
-        if (data == null || !VK.onActivityResult(requestCode, resultCode, data, callback)) {
+        if (!VK.onActivityResult(requestCode, resultCode, data, callback)) {
             super.onActivityResult(requestCode, resultCode, data)
         }
     }