Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update libs #20

Merged
merged 2 commits into from
May 9, 2020
Merged

Update libs #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
12efbe6
Gradle 6.4
satoshun May 9, 2020
e2369de
remove jacoco and circle ci
satoshun May 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 0 additions & 24 deletions .circleci/config.yml
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions autodispose/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,13 @@ apply plugin: 'kotlin-android'
apply plugin: 'org.jetbrains.dokka-android'
apply plugin: "com.vanniktech.maven.publish"

apply plugin: 'jacoco-android'
apply from: rootProject.file('gradle/jacoco.gradle')

android {
compileSdkVersion COMPILE_SDK

defaultConfig {
minSdkVersion MIN_SDK
}

testOptions.unitTests.all {
jacoco.includeNoLocationClasses = true
}

buildTypes {
debug {
testCoverageEnabled true
Expand Down
3 changes: 0 additions & 3 deletions build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ buildscript {
classpath ANDROID_PLUGIN
classpath KOTLIN_PLUGIN
classpath PUBLISH_PLUGIN
classpath(JACOCO_PLUGIN) {
exclude group: 'org.codehaus.groovy', module: 'groovy-all'
}
}
}

Expand Down
1 change: 0 additions & 1 deletion buildSrc/src/main/kotlin/dependencies/Dependencies.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ const val VKOTLIN = "1.3.61"
const val ANDROID_PLUGIN = "com.android.tools.build:gradle:3.5.3"
const val KOTLIN_PLUGIN = "org.jetbrains.kotlin:kotlin-gradle-plugin:$VKOTLIN"
const val PUBLISH_PLUGIN = "com.vanniktech:gradle-maven-publish-plugin:0.8.0"
const val JACOCO_PLUGIN = "com.dicedmelon.gradle:jacoco-android:0.1.4"

private const val VCOUROUTINE = "1.3.2"
const val KOTLIN = "org.jetbrains.kotlin:kotlin-stdlib:$VKOTLIN"
Expand Down
31 changes: 0 additions & 31 deletions gradle/jacoco.gradle
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.4-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists