From 96238f02a7580e26f266fbfee69d8f6454f7ff16 Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Tue, 15 Jun 2021 17:13:56 +0200 Subject: [PATCH 1/3] gradle:4.2.1 --- build.gradle | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index f3df769865..d534f795b5 100644 --- a/build.gradle +++ b/build.gradle @@ -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:4.2.1' + 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 From 740c009471cc706b9486c05562e5bd5092b3144f Mon Sep 17 00:00:00 2001 From: Milos Kozak Date: Wed, 16 Jun 2021 08:23:55 +0200 Subject: [PATCH 2/3] gradle:7.1.0-alpha02 --- automation/build.gradle | 7 ------- build.gradle | 2 +- combo/build.gradle | 7 ------- core/build.gradle | 6 ------ dana/build.gradle | 2 -- danar/build.gradle | 6 ------ danars/build.gradle | 2 -- database/build.gradle | 2 -- gradle/android_dependencies.gradle | 1 - gradle/wrapper/gradle-wrapper.properties | 2 +- insight/build.gradle | 2 -- medtronic/build.gradle | 6 ------ omnipod-common/build.gradle | 6 ------ omnipod-dash/build.gradle | 6 ------ omnipod-eros/build.gradle | 6 ------ pump-common/build.gradle | 6 ------ rileylink/build.gradle | 6 ------ 17 files changed, 2 insertions(+), 73 deletions(-) diff --git a/automation/build.gradle b/automation/build.gradle index 55565f892b..54199af9b9 100644 --- a/automation/build.gradle +++ b/automation/build.gradle @@ -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') diff --git a/build.gradle b/build.gradle index d534f795b5..5215f0c12c 100644 --- a/build.gradle +++ b/build.gradle @@ -44,7 +44,7 @@ buildscript { maven { url "https://plugins.gradle.org/m2/" } // jacoco 0.2 } dependencies { - classpath 'com.android.tools.build:gradle:4.2.1' + 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' diff --git a/combo/build.gradle b/combo/build.gradle index 8020051b31..e7f0567cf9 100644 --- a/combo/build.gradle +++ b/combo/build.gradle @@ -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') } \ No newline at end of file diff --git a/core/build.gradle b/core/build.gradle index 9b2d54be1e..e3a916bdae 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -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') diff --git a/dana/build.gradle b/dana/build.gradle index 33b66a5090..91897b762a 100644 --- a/dana/build.gradle +++ b/dana/build.gradle @@ -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") diff --git a/danar/build.gradle b/danar/build.gradle index 09899f5540..0915729e0f 100644 --- a/danar/build.gradle +++ b/danar/build.gradle @@ -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') diff --git a/danars/build.gradle b/danars/build.gradle index 9ac3aa3f9a..075ebd5e0a 100644 --- a/danars/build.gradle +++ b/danars/build.gradle @@ -11,8 +11,6 @@ android { ndkVersion "21.1.6352462" defaultConfig { - versionCode 1 - versionName "1.0" ndk { moduleName "BleCommandUtil" diff --git a/database/build.gradle b/database/build.gradle index f408159e29..951064cb47 100644 --- a/database/build.gradle +++ b/database/build.gradle @@ -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") diff --git a/gradle/android_dependencies.gradle b/gradle/android_dependencies.gradle index c07f69eea0..b3b28c7edc 100644 --- a/gradle/android_dependencies.gradle +++ b/gradle/android_dependencies.gradle @@ -5,7 +5,6 @@ android { targetSdkVersion 28 testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' } kotlinOptions { diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 404e613d00..6d6af4e166 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/insight/build.gradle b/insight/build.gradle index 33b66a5090..91897b762a 100644 --- a/insight/build.gradle +++ b/insight/build.gradle @@ -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") diff --git a/medtronic/build.gradle b/medtronic/build.gradle index 4c3af48c8a..464f0c4d34 100644 --- a/medtronic/build.gradle +++ b/medtronic/build.gradle @@ -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') diff --git a/omnipod-common/build.gradle b/omnipod-common/build.gradle index 19430b670c..4b8380b21a 100644 --- a/omnipod-common/build.gradle +++ b/omnipod-common/build.gradle @@ -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') diff --git a/omnipod-dash/build.gradle b/omnipod-dash/build.gradle index ea8c60af66..07c4af856d 100644 --- a/omnipod-dash/build.gradle +++ b/omnipod-dash/build.gradle @@ -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') diff --git a/omnipod-eros/build.gradle b/omnipod-eros/build.gradle index e530957c56..83c088300f 100644 --- a/omnipod-eros/build.gradle +++ b/omnipod-eros/build.gradle @@ -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') diff --git a/pump-common/build.gradle b/pump-common/build.gradle index 4661d58948..9923421f06 100644 --- a/pump-common/build.gradle +++ b/pump-common/build.gradle @@ -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') diff --git a/rileylink/build.gradle b/rileylink/build.gradle index 96f2bfa148..1ae5804c92 100644 --- a/rileylink/build.gradle +++ b/rileylink/build.gradle @@ -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') From ad7e5d8295bdc8e57230af5162828d52d970e879 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 08:08:45 +0000 Subject: [PATCH 3/3] Bump byteBuddyVersion from 1.11.3 to 1.11.5 Bumps `byteBuddyVersion` from 1.11.3 to 1.11.5. Updates `byte-buddy` from 1.11.3 to 1.11.5 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.11.3...byte-buddy-1.11.5) Updates `byte-buddy-android` from 1.11.3 to 1.11.5 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.11.3...byte-buddy-1.11.5) Updates `byte-buddy-agent` from 1.11.3 to 1.11.5 - [Release notes](https://github.com/raphw/byte-buddy/releases) - [Changelog](https://github.com/raphw/byte-buddy/blob/master/release-notes.md) - [Commits](https://github.com/raphw/byte-buddy/compare/byte-buddy-1.11.3...byte-buddy-1.11.5) --- updated-dependencies: - dependency-name: net.bytebuddy:byte-buddy dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-android dependency-type: direct:production update-type: version-update:semver-patch - dependency-name: net.bytebuddy:byte-buddy-agent dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index d3da9fe611..9f70f6aad9 100644 --- a/build.gradle +++ b/build.gradle @@ -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'