Skip to content

Commit

Permalink
Merge pull request #17 from 0pen-dash/adrian/linting
Browse files Browse the repository at this point in the history
Adrian/linting
  • Loading branch information
AdrianLxM authored Mar 1, 2021
2 parents 07c6a95 + 89ff502 commit f404505
Show file tree
Hide file tree
Showing 154 changed files with 2,420 additions and 557 deletions.
5 changes: 5 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
root = true


[*{kt,kts}]
disabled_rules=no-wildcard-imports
17 changes: 16 additions & 1 deletion .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 9 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -44,9 +44,10 @@ buildscript {
}
}
maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
maven { url "https://dl.bintray.com/kotlin/kotlinx" }
}
dependencies {
classpath 'com.android.tools.build:gradle:4.0.1'
classpath 'com.android.tools.build:gradle:4.1.2'
classpath 'com.google.gms:google-services:4.3.4'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.4.1'

Expand All @@ -58,6 +59,11 @@ buildscript {
}
}

plugins {
id "io.gitlab.arturbosch.detekt" version "1.16.0-RC2"
id "org.jlleitschuh.gradle.ktlint" version "9.4.1"
}

allprojects {
repositories {
google()
Expand All @@ -78,6 +84,8 @@ allprojects {
includeModule("org.jetbrains.trove4j", "trove4j")
}
}
maven { url "https://dl.bintray.com/kotlin/kotlinx" }

}
//Support @JvmDefault
tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
7 changes: 7 additions & 0 deletions omnipod-dash/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@ apply plugin: 'com.android.library'
apply plugin: 'kotlin-android'
apply plugin: 'kotlin-kapt'
apply plugin: 'com.hiya.jacoco-android'
apply plugin: "io.gitlab.arturbosch.detekt" // TODO move to `subprojects` section in global build.gradle
apply plugin: "org.jlleitschuh.gradle.ktlint" // TODO move to `subprojects` section in global build.gradle

apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
Expand All @@ -14,6 +16,11 @@ android {
}
}

detekt { // TODO move to `subprojects` section in global build.gradle
toolVersion = "1.15.0-RC2"
config = files("./detekt-config.yml") // TODO move to global space and use "../detekt-config.yml"
}

dependencies {
implementation project(':core')
implementation project(':omnipod-common')
Expand Down
Loading

0 comments on commit f404505

Please sign in to comment.