caspervk/AndroidAPS
1
0
Fork 0
Code Releases Activity

Merge branch 'dev' of https://github.com/nightscout/AndroidAPS into dev

Browse source
This commit is contained in:
Milos Kozak 2021-06-23 21:01:52 +02:00
parent 884ecd9f2b 8c8bd6360c
commit 76641649ed
17 changed files with 4 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
automation/build.gradle
View file

@ -8,13 +8,6 @@ apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')
implementation project(':database')

9
build.gradle
View file

@ -33,7 +33,7 @@ buildscript {
dexmakerVersion = "1.2"
retrofit2Version = '2.9.0'
okhttp3Version = '4.9.0'
byteBuddyVersion = '1.11.3'
byteBuddyVersion = '1.11.5'
androidx_junit = '1.1.2'
androidx_rules = '1.4.0-alpha04'
@ -44,11 +44,8 @@ buildscript {
maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2
}
dependencies {
// Update to 4.2.1 is not possible because it forces use build-tools 30.0.2
// and this is not available in travis so far
// see https://issuetracker.google.com/issues/162255866
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.google.gms:google-services:4.3.5'
classpath 'com.android.tools.build:gradle:7.1.0-alpha02'
classpath 'com.google.gms:google-services:4.3.8'
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.7.0'
// NOTE: Do not place your application dependencies here; they belong

7
combo/build.gradle
View file

@ -8,13 +8,6 @@ apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')
}

6
core/build.gradle
View file

@ -9,12 +9,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':database')

2
dana/build.gradle
View file

@ -10,8 +10,6 @@ apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
kapt {
arguments {
arg("room.incremental", "true")

6
danar/build.gradle
View file

@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')

2
danars/build.gradle
View file

@ -11,8 +11,6 @@ android {
ndkVersion "21.1.6352462"
defaultConfig {
versionCode 1
versionName "1.0"
ndk {
moduleName "BleCommandUtil"

2
database/build.gradle
View file

@ -7,8 +7,6 @@ apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
kapt {
arguments {
arg("room.incremental", "true")

1
gradle/android_dependencies.gradle
View file

@ -5,7 +5,6 @@ android {
targetSdkVersion 28
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles 'consumer-rules.pro'
}
kotlinOptions {

2
gradle/wrapper/gradle-wrapper.properties vendored
View file

@ -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.8.2-all.zip
distributionUrl = https\://services.gradle.org/distributions/gradle-7.0-all.zip

2
insight/build.gradle
View file

@ -10,8 +10,6 @@ apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
kapt {
arguments {
arg("room.incremental", "true")

6
medtronic/build.gradle
View file

@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')

6
omnipod-common/build.gradle
View file

@ -8,12 +8,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')

6
omnipod-dash/build.gradle
View file

@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')

6
omnipod-eros/build.gradle
View file

@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')

6
pump-common/build.gradle
View file

@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')

6
rileylink/build.gradle
View file

@ -7,12 +7,6 @@ apply from: "${project.rootDir}/gradle/android_dependencies.gradle"
apply from: "${project.rootDir}/gradle/android_module_dependencies.gradle"
apply from: "${project.rootDir}/gradle/test_dependencies.gradle"
android {
defaultConfig {
versionCode 1
versionName "1.0"
}
}
dependencies {
implementation project(':core')