Skip to content

Commit 88959a4

Browse files
author
roman_tcaregorodtcev
committed
Ktor version moved to base gradle
1 parent 6f3ba30 commit 88959a4

File tree

4 files changed

+17
-9
lines changed

4 files changed

+17
-9
lines changed

glide/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'com.github.dcendents.android-maven'
55

6-
group = 'com.github.Omega-R.OmegaEntities'
6+
group = 'com.github.Omega-R'
77

88
android {
99
compileSdkVersion 29
@@ -36,8 +36,8 @@ dependencies {
3636
api ("com.github.bumptech.glide:glide:4.9.0") {
3737
exclude group: "com.android.support"
3838
}
39-
implementation "io.ktor:ktor-client-core:1.3.1"
40-
implementation "io.ktor:ktor-client-android:1.3.1"
39+
implementation "io.ktor:ktor-client-core:$ktor_version"
40+
implementation "io.ktor:ktor-client-android:$ktor_version"
4141
}
4242
repositories {
4343
mavenCentral()

gradle.properties

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,13 @@ kotlin.code.style=official
1515
kotlin_version = 1.3.61
1616
android_tools_version = 3.4.1
1717

18+
ktor_version = 1.3.1
19+
20+
compile_sdk_version = 29
21+
build_tools_version = "29.0.2"
22+
min_sdk_version = 16
23+
target_sdk_version = 29
24+
1825
# gradle configuration
1926
org.gradle.configureondemand = false
2027

library/build.gradle.kts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ repositories {
5151
configurations.create("compileClasspath")
5252

5353
kotlin {
54+
val ktor_version: String by project
5455
//need to use jvm because android doesnt export type alias
5556
jvm("android") {
5657
compilations.all {
@@ -79,7 +80,7 @@ kotlin {
7980
val commonMain by getting {
8081
dependencies {
8182
implementation("org.jetbrains.kotlin:kotlin-stdlib-common")
82-
implementation("io.ktor:ktor-client-core:1.3.1")
83+
implementation("io.ktor:ktor-client-core:$ktor_version")
8384
}
8485
}
8586

@@ -93,7 +94,7 @@ kotlin {
9394
val androidMain by getting {
9495
dependencies {
9596
implementation("org.jetbrains.kotlin:kotlin-stdlib")
96-
implementation("io.ktor:ktor-client-android:1.3.1")
97+
implementation("io.ktor:ktor-client-android:$ktor_version")
9798
compileOnly("org.robolectric:android-all:9-robolectric-4913185-2")
9899
}
99100
}
@@ -108,7 +109,7 @@ kotlin {
108109

109110
val iosMain by getting {
110111
dependencies {
111-
implementation("io.ktor:ktor-client-ios:1.3.1")
112+
implementation("io.ktor:ktor-client-ios:$ktor_version")
112113
}
113114
}
114115

picasso/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44
apply plugin: 'com.github.dcendents.android-maven'
55

6-
group = 'com.github.Omega-R.OmegaEntities'
6+
group = 'com.github.Omega-R'
77

88
android {
99
compileSdkVersion 29
@@ -36,6 +36,6 @@ dependencies {
3636
api ('com.squareup.picasso:picasso:2.71828') {
3737
exclude group: 'com.android.support', module: 'support-annotations'
3838
}
39-
implementation "io.ktor:ktor-client-core:1.3.1"
40-
implementation "io.ktor:ktor-client-android:1.3.1"
39+
implementation "io.ktor:ktor-client-core:$ktor_version"
40+
implementation "io.ktor:ktor-client-android:$ktor_version"
4141
}

0 commit comments

Comments
 (0)