Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Sign up
Appearance settings

Commit e78cd48

Browse files
update: dependencies, refractor
1 parent 0cad419 commit e78cd48

File tree

49 files changed

+500
-358
lines changed

Some content is hidden

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

49 files changed

+500
-358
lines changed

‎Koin/app/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 26
8+
compileSdkVersion compileSdkVer
99
defaultConfig {
1010
applicationId "com.developers.koin"
11-
minSdkVersion 19
12-
targetSdkVersion 26
11+
minSdkVersion minSdkVer
12+
targetSdkVersion targetSdkVer
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,12 +24,12 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
28-
implementation 'com.android.support:appcompat-v7:26.1.0'
29-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
30-
testImplementation 'junit:junit:4.12'
31-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
32-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
33-
implementation "org.koin:koin-core:0.8.2"
34-
implementation "org.koin:koin-android:0.8.2"
27+
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
28+
implementation "com.android.support:appcompat-v7:$buildToolsVer"
29+
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
30+
testImplementation "junit:junit:$junitVer"
31+
androidTestImplementation "com.android.support.test:runner:$androidTestRunnerVer"
32+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCoreVersion"
33+
implementation "org.koin:koin-core:$koinVersion"
34+
implementation "org.koin:koin-android:$koinVersion"
3535
}

‎Koin/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.21'
4+
apply from: '../dependencies.gradle'
5+
56
repositories {
67
google()
78
jcenter()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11+
classpath "com.android.tools.build:gradle:$androidPluginVer"
1112
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +23,10 @@ allprojects {
2223
}
2324
}
2425

26+
subprojects {
27+
apply from: '../../dependencies.gradle'
28+
}
29+
2530
task clean(type: Delete) {
2631
delete rootProject.buildDir
2732
}

‎KotlinCoroutines/app/build.gradle

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 26
8+
compileSdkVersion compileSdkVer
99
defaultConfig {
1010
applicationId "com.developers.kotlincoroutines"
11-
minSdkVersion 19
12-
targetSdkVersion 26
11+
minSdkVersion minSdkVer
12+
targetSdkVersion targetSdkVer
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -29,12 +29,12 @@ android {
2929

3030
dependencies {
3131
implementation fileTree(dir: 'libs', include: ['*.jar'])
32-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
33-
implementation 'com.android.support:appcompat-v7:26.1.0'
34-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
35-
testImplementation 'junit:junit:4.12'
36-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
37-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
38-
implementation 'com.android.support:cardview-v7:26.1.0'
39-
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:0.21"
32+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
33+
implementation "com.android.support:appcompat-v7:$buildToolsVer"
34+
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
35+
testImplementation "junit:junit:$junitVer"
36+
androidTestImplementation "com.android.support.test:runner:$androidTestRunnerVer"
37+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCoreVersion"
38+
implementation "com.android.support:cardview-v7:$supportVer"
39+
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$coroutinesAndroidVer"
4040
}

‎KotlinCoroutines/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.10'
4+
apply from: '../dependencies.gradle'
5+
56
repositories {
67
google()
78
jcenter()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11+
classpath "com.android.tools.build:gradle:$androidPluginVer"
1112
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +23,10 @@ allprojects {
2223
}
2324
}
2425

26+
subprojects {
27+
apply from: '../../dependencies.gradle'
28+
}
29+
2530
task clean(type: Delete) {
2631
delete rootProject.buildDir
2732
}

‎KotlinTest/app/build.gradle

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ apply plugin: 'kotlin-android'
55
apply plugin: 'kotlin-android-extensions'
66

77
android {
8-
compileSdkVersion 26
8+
compileSdkVersion compileSdkVer
99
defaultConfig {
1010
applicationId "com.developers.kotlintest"
11-
minSdkVersion 19
12-
targetSdkVersion 26
11+
minSdkVersion minSdkVer
12+
targetSdkVersion targetSdkVer
1313
versionCode 1
1414
versionName "1.0"
1515
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -24,11 +24,11 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
28-
implementation 'com.android.support:appcompat-v7:26.1.0'
29-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
30-
testImplementation 'junit:junit:4.12'
31-
testImplementation "io.kotlintest:kotlintest:2.0.7"
32-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
33-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
27+
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
28+
implementation "com.android.support:appcompat-v7:$buildToolsVer"
29+
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
30+
testImplementation "junit:junit:$junitVer"
31+
testImplementation "io.kotlintest:kotlintest:$kotlinTestVersion"
32+
androidTestImplementation "com.android.support.test:runner:$androidTestRunnerVer"
33+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCoreVersion"
3434
}

‎KotlinTest/build.gradle

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.21'
4+
apply from: '../dependencies.gradle'
5+
56
repositories {
67
google()
78
jcenter()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11+
classpath "com.android.tools.build:gradle:$androidPluginVer"
1112
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +23,10 @@ allprojects {
2223
}
2324
}
2425

26+
subprojects {
27+
apply from: '../../dependencies.gradle'
28+
}
29+
2530
task clean(type: Delete) {
2631
delete rootProject.buildDir
2732
}

‎MVPSample/app/build.gradle

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ apply plugin: 'kotlin-kapt'
88

99

1010
android {
11-
compileSdkVersion 26
11+
compileSdkVersion compileSdkVer
1212
defaultConfig {
1313
applicationId "com.developers.mvpsample"
14-
minSdkVersion 19
15-
targetSdkVersion 26
14+
minSdkVersion minSdkVer
15+
targetSdkVersion targetSdkVer
1616
versionCode 1
1717
versionName "1.0"
1818
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -31,26 +31,26 @@ android {
3131

3232
dependencies {
3333
implementation fileTree(dir: 'libs', include: ['*.jar'])
34-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
35-
implementation 'com.android.support:appcompat-v7:26.1.0'
36-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
37-
testImplementation 'junit:junit:4.12'
34+
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
35+
implementation "com.android.support:appcompat-v7:$buildToolsVer"
36+
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
37+
testImplementation "junit:junit:$junitVer"
3838
//Dagger
39-
implementation 'com.google.dagger:dagger:2.9'
40-
kapt "com.google.dagger:dagger-compiler:2.9"
41-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
42-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
43-
implementation 'com.android.support:recyclerview-v7:26.1.0'
44-
implementation 'com.android.support:cardview-v7:26.1.0'
39+
implementation "com.google.dagger:dagger:$daggerVersion"
40+
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
41+
androidTestImplementation "com.android.support.test:runner:$androidTestRunnerVer"
42+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCoreVersion"
43+
implementation "com.android.support:cardview-v7:$supportVer"
44+
implementation "com.android.support:recyclerview-v7:$supportVer"
4545
//Retrofit
46-
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
47-
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
46+
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
47+
implementation "com.squareup.retrofit2:converter-gson:$retrofitConverterGsonVer"
4848
//Picasso
49-
implementation 'com.squareup.picasso:picasso:2.5.2'
49+
implementation "com.squareup.picasso:picasso:$picassoVersion"
5050
//Rx
51-
implementation 'io.reactivex.rxjava2:rxjava:2.1.2'
52-
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
53-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
51+
implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
52+
implementation "io.reactivex.rxjava2:rxandroid:$rxJavaAndroidVersion"
53+
implementation "com.squareup.retrofit2:adapter-rxjava2:$rxJavaRetrofitAdapterVer"
5454
//Support
55-
implementation 'com.android.support:design:26.1.0'
55+
implementation "com.android.support:design:$supportVer"
5656
}

‎MVPSample/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.21'
4+
apply from: '../dependencies.gradle'
5+
56
repositories {
67
google()
78
jcenter()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11+
classpath "com.android.tools.build:gradle:$androidPluginVer"
1112
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +23,10 @@ allprojects {
2223
}
2324
}
2425

26+
subprojects {
27+
apply from: '../../dependencies.gradle'
28+
}
29+
2530
task clean(type: Delete) {
2631
delete rootProject.buildDir
27-
}
32+
}

‎MVVMSample/app/build.gradle

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ apply plugin: 'kotlin-android-extensions'
77
apply plugin: 'kotlin-kapt'
88

99
android {
10-
compileSdkVersion 26
10+
compileSdkVersion compileSdkVer
1111
defaultConfig {
1212
applicationId "com.developers.mvvmsample"
13-
minSdkVersion 19
14-
targetSdkVersion 26
13+
minSdkVersion minSdkVer
14+
targetSdkVersion targetSdkVer
1515
versionCode 1
1616
versionName "1.0"
1717
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -30,28 +30,28 @@ android {
3030

3131
dependencies {
3232
implementation fileTree(dir: 'libs', include: ['*.jar'])
33-
implementation "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
34-
implementation 'com.android.support:appcompat-v7:26.1.0'
35-
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
36-
testImplementation 'junit:junit:4.12'
37-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
38-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
33+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
34+
implementation "com.android.support:appcompat-v7:$buildToolsVer"
35+
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
36+
testImplementation "junit:junit:$junitVer"
37+
androidTestImplementation "com.android.support.test:runner:$androidTestRunnerVer"
38+
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCoreVersion"
3939
//Dagger
40-
implementation 'com.google.dagger:dagger:2.9'
41-
kapt "com.google.dagger:dagger-compiler:2.9"
42-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
43-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
44-
implementation 'com.android.support:recyclerview-v7:26.1.0'
45-
implementation 'com.android.support:cardview-v7:26.1.0'
40+
implementation "com.google.dagger:dagger:$daggerVersion"
41+
kapt "com.google.dagger:dagger-compiler:$daggerVersion"
42+
43+
implementation "com.android.support:cardview-v7:$supportVer"
44+
implementation "com.android.support:recyclerview-v7:$supportVer"
4645
//Retrofit
47-
implementation 'com.squareup.retrofit2:retrofit:2.3.0'
48-
implementation 'com.squareup.retrofit2:converter-gson:2.3.0'
46+
implementation "com.squareup.retrofit2:retrofit:$retrofitVersion"
47+
implementation "com.squareup.retrofit2:converter-gson:$retrofitConverterGsonVer"
4948
//Picasso
50-
implementation 'com.squareup.picasso:picasso:2.5.2'
49+
implementation "com.squareup.picasso:picasso:$picassoVersion"
5150
//Rx
52-
implementation 'io.reactivex.rxjava2:rxjava:2.1.3'
53-
implementation 'io.reactivex.rxjava2:rxandroid:2.0.1'
54-
implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0'
51+
implementation "io.reactivex.rxjava2:rxjava:$rxJavaVersion"
52+
implementation "io.reactivex.rxjava2:rxandroid:$rxJavaAndroidVersion"
53+
implementation "com.squareup.retrofit2:adapter-rxjava2:$rxJavaRetrofitAdapterVer"
5554
//Support
56-
implementation 'com.android.support:design:26.1.0'
55+
implementation "com.android.support:design:$supportVer"
56+
5757
}

‎MVVMSample/build.gradle

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
// Top-level build file where you can add configuration options common to all sub-projects/modules.
22

33
buildscript {
4-
ext.kotlin_version = '1.2.21'
4+
apply from: '../dependencies.gradle'
5+
56
repositories {
67
google()
78
jcenter()
89
}
910
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11+
classpath "com.android.tools.build:gradle:$androidPluginVer"
1112
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
1213

1314
// NOTE: Do not place your application dependencies here; they belong
@@ -22,6 +23,10 @@ allprojects {
2223
}
2324
}
2425

26+
subprojects {
27+
apply from: '../../dependencies.gradle'
28+
}
29+
2530
task clean(type: Delete) {
2631
delete rootProject.buildDir
27-
}
32+
}

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /