Skip to content

Commit 7d4c7df

Browse files
BoxResinBoxResin
committed
Update obsoleted gradle script
Updated .gitignore, kotlin version, sdk version, etc.
1 parent 430d9bd commit 7d4c7df

File tree

10 files changed

+107
-172
lines changed

10 files changed

+107
-172
lines changed

‎.gitignore‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
1+
# Build files
2+
build/
3+
4+
# Project setting files
5+
.idea/
16
*.iml
2-
.gradle
3-
/local.properties
4-
/.idea/workspace.xml
5-
/.idea/libraries
7+
local.properties
8+
9+
# Gradle generation files
10+
.gradle/
11+
12+
# OS related files
613
.DS_Store
7-
/build
8-
/captures
9-
.externalNativeBuild
14+
Thumbs.db

‎.idea/compiler.xml‎

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.idea/copyright/profiles_settings.xml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.idea/dictionaries/eomin.xml‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎.idea/encodings.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.idea/misc.xml‎

Lines changed: 5 additions & 52 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Library/build.gradle‎

Lines changed: 34 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -3,46 +3,48 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'com.novoda.bintray-release'
44

55
publish {
6-
userOrg = 'boxresin'
7-
groupId = 'boxresin.library'
8-
artifactId = 'AndroidThreadSwitcher'
9-
publishVersion = '1.0.0'
10-
desc = 'A handy android library to make it easy to switch between UI and Worker thread'
11-
website = 'https://github.com/BoxResin/AndroidThreadSwitcher'
6+
userOrg = 'boxresin'
7+
groupId = 'boxresin.library'
8+
artifactId = 'AndroidThreadSwitcher'
9+
publishVersion = '1.0.0'
10+
desc = 'A handy android library to make it easy to switch between UI and Worker thread'
11+
website = 'https://github.com/BoxResin/AndroidThreadSwitcher'
1212
}
1313

1414
// Prevent an error that gradle can't generate java-docs from '*.kt' files.
1515
tasks.withType(Javadoc).all {
16-
enabled = false
16+
enabled = false
1717
}
1818

1919
android {
20-
compileSdkVersion 27
21-
buildToolsVersion "27.0.3"
22-
23-
defaultConfig {
24-
minSdkVersion 14
25-
targetSdkVersion 27
26-
27-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
28-
29-
}
30-
buildTypes {
31-
release {
32-
minifyEnabled false
33-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
34-
}
35-
}
20+
compileSdkVersion 28
21+
22+
defaultConfig {
23+
minSdkVersion 14
24+
targetSdkVersion 28
25+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
26+
}
27+
28+
buildTypes {
29+
release {
30+
minifyEnabled false
31+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
32+
}
33+
}
3634
}
3735

3836
dependencies {
39-
compile fileTree(dir: 'libs', include: ['*.jar'])
40-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
41-
exclude group: 'com.android.support', module: 'support-annotations'
42-
})
43-
testCompile 'junit:junit:4.12'
44-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
45-
}
46-
repositories {
47-
mavenCentral()
37+
// Local JAR
38+
implementation fileTree(dir: 'libs', include: ['*.jar'])
39+
40+
// Kotlin
41+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
42+
43+
// Test
44+
testImplementation 'junit:junit:4.12'
45+
46+
// Android Test
47+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
48+
exclude group: 'com.android.support', module: 'support-annotations'
49+
})
4850
}

‎app/build.gradle‎

Lines changed: 35 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,35 +3,42 @@ apply plugin: 'kotlin-android'
33
apply plugin: 'kotlin-android-extensions'
44

55
android {
6-
compileSdkVersion 27
7-
buildToolsVersion "27.0.3"
8-
defaultConfig {
9-
applicationId "boxresin.test.android_thread_switcher"
10-
minSdkVersion 14
11-
targetSdkVersion 27
12-
versionCode 1
13-
versionName "1.0"
14-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15-
}
16-
buildTypes {
17-
release {
18-
minifyEnabled false
19-
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
20-
}
21-
}
6+
compileSdkVersion 28
7+
8+
defaultConfig {
9+
applicationId "boxresin.test.android_thread_switcher"
10+
minSdkVersion 14
11+
targetSdkVersion 28
12+
versionCode 1
13+
versionName "1.0.0"
14+
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
15+
}
16+
17+
buildTypes {
18+
release {
19+
minifyEnabled false
20+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
21+
}
22+
}
2223
}
2324

2425
dependencies {
25-
compile fileTree(dir: 'libs', include: ['*.jar'])
26-
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
27-
exclude group: 'com.android.support', module: 'support-annotations'
28-
})
29-
compile 'com.android.support:appcompat-v7:27.0.2'
30-
compile 'com.android.support.constraint:constraint-layout:1.0.2'
31-
testCompile 'junit:junit:4.12'
32-
compile project(':Library')
33-
compile "org.jetbrains.kotlin:kotlin-stdlib-jre7:$kotlin_version"
34-
}
35-
repositories {
36-
mavenCentral()
26+
// Local JAR & Module
27+
implementation fileTree(dir: 'libs', include: ['*.jar'])
28+
implementation project(':Library')
29+
30+
// Kotlin
31+
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
32+
33+
// AndroidX
34+
implementation 'com.android.support:appcompat-v7:28.0.0-rc02'
35+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
36+
37+
// Test
38+
testImplementation 'junit:junit:4.12'
39+
40+
// Android Test
41+
androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
42+
exclude group: 'com.android.support', module: 'support-annotations'
43+
})
3744
}

‎build.gradle‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,30 @@
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'
5-
repositories {
6-
jcenter()
7-
google()
8-
}
9-
dependencies {
10-
classpath 'com.android.tools.build:gradle:3.0.1'
11-
classpath 'com.novoda:bintray-release:0.7.0'
12-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
4+
ext.kotlin_version = '1.2.70'
135

14-
// NOTE: Do not place your application dependencies here; they belong
15-
// in the individual module build.gradle files
16-
}
6+
repositories {
7+
jcenter()
8+
google()
9+
}
10+
11+
dependencies {
12+
classpath 'com.android.tools.build:gradle:3.3.0-alpha10'
13+
classpath 'com.novoda:bintray-release:0.7.0'
14+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
15+
16+
// NOTE: Do not place your application dependencies here; they belong
17+
// in the individual module build.gradle files
18+
}
1719
}
1820

1921
allprojects {
20-
repositories {
21-
jcenter()
22-
google()
23-
}
22+
repositories {
23+
jcenter()
24+
google()
25+
}
2426
}
2527

2628
task clean(type: Delete) {
27-
delete rootProject.buildDir
29+
delete rootProject.buildDir
2830
}

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
#Wed Jan 03 20:18:59 KST 2018
1+
#Sat Sep 15 14:43:38 KST 2018
22
distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10-all.zip

0 commit comments

Comments
 (0)