gradle:7.1.0-alpha02

2021-06-16 08:23:55 +02:00 · 2021-06-16 08:23:55 +02:00 · 740c009471
commit 740c009471
parent 96238f02a7
17 changed files with 2 additions and 73 deletions
--- 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')
--- 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'

--- 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')
 }
--- 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')
--- 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")
--- 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')
--- 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"
--- 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")
--- 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 {
--- 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
--- 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")
--- 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')
--- 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')
--- 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')
--- 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')
--- 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')
--- 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')