From 09c2041c117a2477ea61d3f414d4216623f494a7 Mon Sep 17 00:00:00 2001 From: Nelson Osacky Date: Fri, 24 Sep 2021 10:54:24 +0200 Subject: [PATCH] Update with Gradle 7 compatibility --- mobile_app1/build.gradle | 16 ++++------------ .../gradle/wrapper/gradle-wrapper.properties | 2 +- mobile_app1/module1259/build.gradle | 2 +- mobile_app1/module438/build.gradle | 2 +- mobile_app1/module46/build.gradle | 2 +- mobile_app1/module464/build.gradle | 2 +- mobile_app1/settings.gradle | 2 +- 7 files changed, 10 insertions(+), 18 deletions(-) diff --git a/mobile_app1/build.gradle b/mobile_app1/build.gradle index c7c72f5cae..60dfa49447 100644 --- a/mobile_app1/build.gradle +++ b/mobile_app1/build.gradle @@ -1,11 +1,11 @@ buildscript { - ext.kotlin_version = providers.systemProperty('kotlinVersion').forUseAtConfigurationTime().orNull ?: '1.4.30' + ext.kotlin_version = providers.systemProperty('kotlinVersion').forUseAtConfigurationTime().orNull ?: '1.5.30' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath "com.android.tools.build:gradle:${providers.systemProperty("agpVersion").forUseAtConfigurationTime().orNull ?: '4.2.0-beta04'}" + classpath "com.android.tools.build:gradle:${providers.systemProperty("agpVersion").forUseAtConfigurationTime().orNull ?: '7.0.2'}" classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" if ((providers.systemProperty('okbuck.wrapper').forUseAtConfigurationTime().orNull ?: 'false').toBoolean()) { classpath "com.uber:okbuck:0.52.3" @@ -18,15 +18,7 @@ plugins { allprojects { repositories { google() - jcenter() - } - // Disable unused build variants - plugins.withType(com.android.build.gradle.BasePlugin) { - androidComponents { - beforeVariants(selector().withBuildType("release"), { enabled = false }) - beforeUnitTests(selector().all(), { enabled = false }) - beforeAndroidTests(selector().all(), { enabled = false }) - } + mavenCentral() } } task clean(type: Delete) { diff --git a/mobile_app1/gradle/wrapper/gradle-wrapper.properties b/mobile_app1/gradle/wrapper/gradle-wrapper.properties index fba0f0761d..49ea58d7fd 100644 --- a/mobile_app1/gradle/wrapper/gradle-wrapper.properties +++ b/mobile_app1/gradle/wrapper/gradle-wrapper.properties @@ -3,5 +3,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.8-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip \ No newline at end of file diff --git a/mobile_app1/module1259/build.gradle b/mobile_app1/module1259/build.gradle index 726649a174..2fa2fbf22c 100644 --- a/mobile_app1/module1259/build.gradle +++ b/mobile_app1/module1259/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java-library' apply plugin: 'kotlin' dependencies { implementation "org.jetbrains.kotlin:kotlin-allopen:1.4.21" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } sourceCompatibility = "1.8" targetCompatibility = "1.8" \ No newline at end of file diff --git a/mobile_app1/module438/build.gradle b/mobile_app1/module438/build.gradle index c58eede409..57bfa4e339 100644 --- a/mobile_app1/module438/build.gradle +++ b/mobile_app1/module438/build.gradle @@ -6,7 +6,7 @@ dependencies { implementation "com.squareup.okio:okio:2.7.0" implementation project(':module252') implementation project(':module872') - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } sourceCompatibility = "1.8" targetCompatibility = "1.8" \ No newline at end of file diff --git a/mobile_app1/module46/build.gradle b/mobile_app1/module46/build.gradle index 78688fbbd6..06f1d12579 100644 --- a/mobile_app1/module46/build.gradle +++ b/mobile_app1/module46/build.gradle @@ -5,7 +5,7 @@ dependencies { implementation "androidx.annotation:annotation-experimental:1.0.0" implementation project(':module252') implementation project(':module438') - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } sourceCompatibility = "1.8" targetCompatibility = "1.8" \ No newline at end of file diff --git a/mobile_app1/module464/build.gradle b/mobile_app1/module464/build.gradle index 726649a174..2fa2fbf22c 100644 --- a/mobile_app1/module464/build.gradle +++ b/mobile_app1/module464/build.gradle @@ -2,7 +2,7 @@ apply plugin: 'java-library' apply plugin: 'kotlin' dependencies { implementation "org.jetbrains.kotlin:kotlin-allopen:1.4.21" - compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" } sourceCompatibility = "1.8" targetCompatibility = "1.8" \ No newline at end of file diff --git a/mobile_app1/settings.gradle b/mobile_app1/settings.gradle index 161207d959..1264068ad7 100644 --- a/mobile_app1/settings.gradle +++ b/mobile_app1/settings.gradle @@ -1,4 +1,4 @@ -plugins { id "com.gradle.enterprise" version "3.5.1" } +plugins { id "com.gradle.enterprise" version "3.7" } rootProject.name = 'mobile_app1' include 'module0','module1','module2','module3','module4','module5','module6','module7','module8','module9','module10','module11','module12','module13','module14','module15','module16','module17','module18','module19','module20','module21','module22','module24','module25','module27','module28','module29','module30','module31','module32','module34','module35','module36','module37','module38','module39','module40','module41','module42','module43','module44','module45','module47','module48','module49','module50','module51','module52','module53','module54','module55','module56','module57','module58','module59','module60','module61','module62','module63','module64','module65','module67','module68','module69','module70','module71','module72','module73','module74','module75','module76','module77','module78','module79','module81','module82','module83','module84','module85','module86','module87','module89','module90','module91','module92','module93','module94','module95','module96','module97','module98','module100','module101','module102','module103','module104','module105','module106','module107','module108','module109','module110','module111','module113','module114','module115','module117','module118','module119','module120','module121','module122','module124','module125','module126','module127','module128','module129','module130','module131','module132','module133','module134','module135','module136','module137','module138','module139','module140','module141','module142','module143','module144','module145','module146','module147','module148','module149','module150','module151','module152','module153','module154','module155','module156','module158','module159','module161','module162','module163','module164','module165','module166','module167','module168','module169','module170','module171','module172','module173','module174','module175','module176','module177','module178','module179','module180','module181','module182','module183','module185','module186','module187','module188','module189','module190','module191','module192','module193','module194','module195','module196','module197','module198','module199','module200','module201','module202','module203','module204','module205','module206','module207','module208','module209','module210','module211','module212','module213','module214','module215','module216','module217','module218','module219','module220','module221','module222','module223','module224','module225','module226','module227','module228','module229','module230','module231','module232','module233','module234','module235','module236','module237','module238','module239','module240','module241','module242','module243','module244','module245','module246','module247','module248','module249','module250','module251','module253','module254','module255','module256','module257','module258','module259','module260','module261','module262','module263','module264'