Skip to content

Commit 9417300

Browse files
author
Oleg Smirnov
committed
version 3.0.0
1 parent 32898fa commit 9417300

File tree

808 files changed

+39816
-10310
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

808 files changed

+39816
-10310
lines changed

README.md

Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
VK SDK for Android
22
==========
33

4-
[![Maven Central](https://img.shields.io/maven-central/v/com.vk/androidsdk.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.vk%22%20AND%20a:%22androidsdk%22)
4+
[![Maven Central](https://img.shields.io/maven-central/v/com.vk/android-sdk-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.vk%22%20AND%20a:%22android-sdk-core%22)
55

66
Library for working with VK API, authorization through VK app, using VK functions. Minimal version of Android is 5.0
77

@@ -52,23 +52,27 @@ Connecting VK SDK to Your Android Application
5252

5353
Connecting With Maven
5454
----------
55+
[![Core Release](https://img.shields.io/maven-central/v/com.vk/android-sdk-core.svg?label=Maven%20Central)](https://search.maven.org/search?q=g:%22com.vk%22%20AND%20a:%22android-sdk-core%22)
56+
57+
5558
You can add next maven dependency in your project:
5659

57-
You may also need to add the following to your `project/build.gradle` file.
60+
The available library modules are listed below.
61+
62+
* `android-sdk-core`: Core functionality (required).
63+
* `android-sdk-api` : Api generated models and methods.
5864

59-
`implementation 'com.vk:androidsdk:2.4.0`
65+
* `androidsdk`: deprecated copy version of the android-sdk-core(will be removed in future releases).
66+
* `androidsdkapi` : deprecated copy version of the android-sdk-api(will be removed in future releases).
6067

6168
For example, your `app/build.gradle` script will contains such dependencies:
6269
```
6370
dependencies {
64-
implementation 'com.vk:androidsdk:2.4.0
71+
implementation 'com.vk:android-sdk-core:3.0.0
72+
implementation 'com.vk:android-sdk-api:3.0.0 // generated models and api methods
6573
}
6674
```
6775

68-
Older version
69-
----------
70-
Older version of sdk can be found **[here](https://github.com/VKCOM/vk-android-sdk/releases/tag/1.6.7)**
71-
7276
Using SDK
7377
==========
7478

@@ -136,18 +140,20 @@ class SampleApplication: Application() {
136140
API Requests
137141
==========
138142

139-
Run request with VK.execute:
140-
143+
Run request with VK.execute and auto generated methods(android-sdk-api dependency is required):
141144

142145
```kotlin
143-
VK.execute(UsersGet(), object: VKApiCallback<List<UsersUserXtrCounters>> {
144-
override fun success(result: List<UsersUserXtrCounters>) {
145-
}
146-
override fun fail(error: VKApiExecutionException) {
147-
}
148-
})
146+
VK.execute(FriendsService().friendsGet(fields = fields), object: VKApiCallback<FriendsGetFieldsResponse> {
147+
override fun success(result: FriendsGetFieldsResponse) {
148+
// you stuff is here
149+
}
150+
override fun fail(error: Exception) {
151+
Log.e(TAG, error.toString())
152+
}
153+
})
149154
```
150155

156+
151157
If you are using RxJava in your project, you can do something like this:
152158

153159
```kotlin

build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,14 @@ apply from: 'dependencies.gradle'
2727
subprojects { Project subproject ->
2828
buildscript {
2929
repositories {
30+
jcenter {
31+
content {
32+
includeModule("com.jfrog.bintray.gradle", "gradle-bintray-plugin")
33+
includeModule("org.codehaus.groovy.modules.http-builder", "http-builder")
34+
}
35+
}
3036
google()
3137
mavenCentral()
32-
jcenter()
3338
maven { url 'https://maven.google.com' }
3439
}
3540

@@ -42,7 +47,7 @@ subprojects { Project subproject ->
4247

4348
repositories {
4449
google()
45-
jcenter()
50+
mavenCentral()
4651
}
4752
}
4853

dependencies.gradle

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ SOFTWARE.
2323
*/
2424

2525
ext.sdkVersions = [
26-
code : '21',
27-
name : '2.6.0',
26+
code : '23',
27+
name : '3.0.0',
2828

2929
minSdk : 21,
3030
targetSdk : 29,
@@ -68,17 +68,21 @@ ext.testLibraries = [
6868
ext.sdkGradlePlugins = [
6969
android : "com.android.tools.build:gradle:$sdkVersions.androidGradlePlugin",
7070
kotlinGradle : "org.jetbrains.kotlin:kotlin-gradle-plugin:$sdkVersions.kotlin",
71-
bintryRelease : "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4",
71+
bintryRelease : "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.5",
7272
]
7373

7474
ext.sdkPublish = [
7575
POM_NAME : "VK API library",
76-
POM_ARTIFACT_ID : 'androidsdk',
76+
POM_ARTIFACT_ID : 'android-sdk-core',
7777
POM_DESCRIPTION : 'Main VK Android API library',
7878
POM_URL : 'https://github.com/VKCOM/vk-android-sdk',
7979
POM_SCM_URL : 'https://github.com/VKCOM/vk-android-sdk',
8080
POM_SCM_CONNECTION : 'scm:git:git://github.com/VKCOM/vk-android-sdk.git',
8181
POM_SCM_DEV_CONNECTION : 'scm:git:git://github.com/VKCOM/vk-android-sdk.git',
8282
POM_LICENCE_URL : 'https://github.com/VKCOM/vk-android-sdk/raw/master/LICENSE',
83+
84+
POM_API_NAME : 'VK API Models library',
85+
POM_API_ARTIFACT_ID : 'android-sdk-api',
86+
POM_API_DESCRIPTION : 'VK Android API generated library',
8387
]
8488

publish.gradle

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
* SOFTWARE.
2323
******************************************************************************/
2424

25-
apply from: '../dependencies.gradle'
26-
2725
static def getRepoUrl() {
2826
return "https://oss.sonatype.org/service/local/staging/deploy/maven2/"
2927
}
@@ -35,6 +33,11 @@ static def getRepoPassword() {
3533
return System.getenv('NEXUS_PASSWORD')
3634
}
3735

36+
def getArtifactId() {
37+
def envArtifactId = System.getenv('POM_ARTIFACT_ID')
38+
return envArtifactId != null ? envArtifactId : sdkPublish.POM_ARTIFACT_ID
39+
}
40+
3841
if (System.getenv('SDK_UPDATE') == "1") {
3942
apply plugin: 'com.jfrog.bintray'
4043
apply plugin: 'maven-publish'
@@ -50,7 +53,7 @@ if (System.getenv('SDK_UPDATE') == "1") {
5053
mavenDeployer {
5154
beforeDeployment { MavenDeployment deployment -> signing.signPom(deployment) }
5255

53-
pom.artifactId = sdkPublish.POM_ARTIFACT_ID
56+
pom.artifactId = getArtifactId()
5457

5558
repository(url: sonatypeRepositoryUrl) {
5659
authentication(userName: getRepoUsername(), password: getRepoPassword())

samples/app/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
/build
2+
notTranslatedStrings/

samples/app/build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ android {
5353
}
5454

5555
dependencies {
56-
implementation fileTree(dir: 'libs', include: '*.jar')
5756
implementation sdkLibraries.kotlin
5857
implementation sdkLibrariesSupport.recyclerView
5958
implementation sdkLibrariesSupport.appCompat
@@ -62,5 +61,4 @@ dependencies {
6261

6362
implementation project(':libapi-sdk-core')
6463
implementation project(':libapi-sdk-api')
65-
//implementation 'com.vk:androidsdk:2.0.0'
6664
}

samples/app/sdk/src/main/res/values/strings.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<resources>
33
<string name="login">Войти</string>
44
<string name="logout">Выйти</string>
5-
<string name="share_to_wall">Post on wall</string>
5+
<string name="share_to_wall">Отправить на стену</string>
66
<string name="message_hint">Ваше сообщение</string>
77
<string name="wall_ok">Posted</string>
88
</resources>

samples/app/src/main/java/com/vk/sdk/sample/SampleApplication.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ package com.vk.sdk.sample
2626

2727
import android.app.Application
2828
import com.vk.api.sdk.VK
29+
import com.vk.api.sdk.VKApiConfig
2930
import com.vk.api.sdk.VKTokenExpiredHandler
3031

3132
class SampleApplication: Application() {

samples/app/src/main/java/com/vk/sdk/sample/UserActivity.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@ import androidx.recyclerview.widget.RecyclerView
3939
import com.squareup.picasso.Picasso
4040
import com.vk.api.sdk.VK
4141
import com.vk.api.sdk.VKApiCallback
42-
import com.vk.sdk.api.friends.dto.FriendsGetFieldsResponseDto
43-
import com.vk.sdk.api.friends.methods.FriendsGetFields
42+
import com.vk.sdk.api.friends.FriendsService
43+
import com.vk.sdk.api.friends.dto.FriendsGetFieldsResponse
4444
import com.vk.sdk.api.users.dto.UsersFields
4545
import com.vk.sdk.sample.models.VKUser
4646
import com.vk.sdk.sample.requests.VKUsersCommand
@@ -96,8 +96,8 @@ class UserActivity: Activity() {
9696

9797
private fun requestFriends() {
9898
val fields = listOf(UsersFields.PHOTO_200)
99-
VK.execute(FriendsGetFields(fields = fields), object: VKApiCallback<FriendsGetFieldsResponseDto> {
100-
override fun success(result: FriendsGetFieldsResponseDto) {
99+
VK.execute(FriendsService().friendsGet(fields = fields), object: VKApiCallback<FriendsGetFieldsResponse> {
100+
override fun success(result: FriendsGetFieldsResponse) {
101101
val friends = result.items
102102
if (!isFinishing && friends.isNotEmpty()) {
103103
val vkUsers = friends.map { friend ->
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="login">Войти</string>
4+
<string name="logout">Выйти</string>
5+
<string name="share_to_wall">Отправить на стену</string>
6+
<string name="message_hint">Ваше сообщение</string>
7+
<string name="wall_ok">Запись опубликована</string>
8+
</resources>

0 commit comments

Comments
 (0)