From 88a70a43867243c90f9bed49f02e6a967e85a8f5 Mon Sep 17 00:00:00 2001 From: Shivam Goyal Date: Tue, 22 Aug 2023 14:48:26 +0530 Subject: [PATCH] TP-37525 | BuildScript Migration (#7459) --- app/build.gradle | 54 ++------------------------ build.gradle | 75 +++++++++--------------------------- navi-amc/build.gradle | 12 ++---- navi-analytics/build.gradle | 4 +- navi-ap/build.gradle | 6 +-- navi-base/build.gradle | 8 ++-- navi-chat/build.gradle | 8 ++-- navi-common/build.gradle | 8 ++-- navi-design/build.gradle | 6 +-- navi-hl/build.gradle | 10 ++--- navi-insurance/build.gradle | 8 ++-- navi-payment/build.gradle | 8 ++-- navi-rr/build.gradle | 8 ++-- navi-vkyc/build.gradle | 8 ++-- navi-widgets/build.gradle | 12 ++---- navi_hl_dynamic/build.gradle | 10 ++--- navi_pl_dynamic/build.gradle | 6 +-- pulse/build.gradle | 4 +- settings.gradle | 11 ++++++ 19 files changed, 89 insertions(+), 177 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index e629c0650f..06767a99e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,16 +1,13 @@ -import org.gradle.api.tasks.testing.logging.TestExceptionFormat -import org.gradle.api.tasks.testing.logging.TestLogEvent - plugins { id 'com.android.application' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' id 'maven-publish' id 'com.google.firebase.crashlytics' id 'com.google.gms.google-services' id 'com.google.firebase.firebase-perf' - id 'dagger.hilt.android.plugin' + id 'com.google.dagger.hilt.android' id 'hypersdk-asset-plugin' } @@ -207,11 +204,6 @@ static def formatString(String value) { return '"' + value + '"' } -repositories { - mavenCentral() - google() -} - publishing { repositories { if (project.hasProperty('NEXUS_URL') @@ -368,41 +360,3 @@ dependencies { debugImplementation hyperion.menu releaseImplementation hyperion.release_core } - -tasks.withType(Compiler) { - options.encoding = "UTF-8" -} - -tasks.withType(Test) { - testLogging { - // set options for log level LIFECYCLE - events TestLogEvent.FAILED, - TestLogEvent.PASSED, - TestLogEvent.SKIPPED, - TestLogEvent.STANDARD_OUT - exceptionFormat TestExceptionFormat.FULL - showExceptions true - showCauses true - showStackTraces true - // set options for log level DEBUG and INFO - debug { - events TestLogEvent.STARTED, - TestLogEvent.FAILED, - TestLogEvent.PASSED, - TestLogEvent.SKIPPED, - TestLogEvent.STANDARD_ERROR, - TestLogEvent.STANDARD_OUT - exceptionFormat TestExceptionFormat.FULL - } - info.events = debug.events - info.exceptionFormat = debug.exceptionFormat - afterSuite { desc, result -> - if (!desc.parent) { // will match the outermost suite - def output = "Results: ${result.resultType} (${result.testCount} tests, ${result.successfulTestCount} passed, ${result.failedTestCount} failed, ${result.skippedTestCount} skipped)" - def startItem = '| ', endItem = ' |' - def repeatLength = startItem.length() + output.length() + endItem.length() - println('\n' + ('-' * repeatLength) + '\n' + startItem + output + endItem + '\n' + ('-' * repeatLength)) - } - } - } -} \ No newline at end of file diff --git a/build.gradle b/build.gradle index aaca002cff..2f9ebd0296 100644 --- a/build.gradle +++ b/build.gradle @@ -1,90 +1,53 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. - buildscript { - repositories { - google() - mavenCentral() - maven { url 'https://maven.fabric.io/public' } - maven { url 'https://plugins.gradle.org/m2/' } - maven { - url "https://maven.juspay.in/jp-build-packages/hypersdk-asset-download/releases/" - } - maven { url "https://finarkein.jfrog.io/artifactory/anubhav-maven" } - - } dependencies { - classpath 'com.android.tools.build:gradle:7.3.1' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.8.0" - classpath 'com.google.gms:google-services:4.3.15' - classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.2' - // NOTE: Do not place your application dependencies here; they belong - // in the individual module adle files - - // Add the Crashlytics Gradle plugin. - classpath 'com.google.firebase:firebase-crashlytics-gradle:2.8.1' - classpath 'com.google.firebase:perf-plugin:1.4.1' - - classpath 'com.google.dagger:hilt-android-gradle-plugin:2.44' classpath 'in.juspay:hypersdk-asset-plugin:1.0.3' - classpath 'org.codehaus.groovy:groovy-json:3.0.7' } - apply from: 'dependencies.gradle' } plugins { - id 'com.diffplug.spotless' version '6.20.0' + id 'com.android.application' version '7.3.1' apply false id 'org.jetbrains.kotlin.android' version '1.8.10' apply false + id 'com.google.gms.google-services' version '4.3.15' apply false + id 'com.google.firebase.crashlytics' version '2.8.1' apply false + id 'com.google.firebase.firebase-perf' version '1.4.1' apply false + id 'com.google.dagger.hilt.android' version '2.44' apply false + id 'androidx.navigation.safeargs.kotlin' version '2.4.2' apply false + id 'com.diffplug.spotless' version '6.20.0' } -apply from: "$project.rootDir/spotless.gradle" +apply from: 'spotless.gradle' +apply from: 'dependencies.gradle' allprojects { repositories { google() mavenCentral() maven { + url 'https://nexus.cmd.navi-tech.in/repository/maven-snapshots' credentials { username 'nexus-user' password 'nexus-user' } - url "https://nexus.cmd.navi-tech.in/repository/maven-snapshots" } maven { + url 'https://nexus.cmd.navi-tech.in/repository/maven-releases' credentials { username 'nexus-user' password 'nexus-user' } - url "https://nexus.cmd.navi-tech.in/repository/maven-releases" } + maven { url 'https://s3.ap-south-1.amazonaws.com/hvsdk/android/releases' } maven { - url "https://s3.ap-south-1.amazonaws.com/hvsdk/android/releases" - } - maven { - url "s3://okyc-navi-sdk.s3.amazonaws.com" + url 's3://okyc-navi-sdk.s3.amazonaws.com' credentials(AwsCredentials) { - accessKey "AKIA325LPZPYF2PRBOVE" - secretKey "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" + accessKey 'AKIA325LPZPYF2PRBOVE' + secretKey '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' } } - maven { - url "https://phonepe.mycloudrepo.io/public/repositories/phonepe-intentsdk-android" - } - maven { - url "https://maven.juspay.in/jp-build-packages/hyper-sdk/" - } - maven { url "https://finarkein.jfrog.io/artifactory/anubhav-maven" } - maven { - url "https://cashshield-sdk.s3.amazonaws.com/release/" - } + maven { url 'https://phonepe.mycloudrepo.io/public/repositories/phonepe-intentsdk-android' } + maven { url 'https://maven.juspay.in/jp-build-packages/hyper-sdk/' } + maven { url 'https://finarkein.jfrog.io/artifactory/anubhav-maven' } // jitpack should be last repository - maven { url "https://jitpack.io" } - } - configurations.all { - resolutionStrategy { - // required by room and we cannot update room version as - // it may want us to change minSdkVersion - // https://issuetracker.google.com/issues/174695268?pli=1#comment10 - force 'org.xerial:sqlite-jdbc:3.34.0' - } + maven { url 'https://jitpack.io' } } } diff --git a/navi-amc/build.gradle b/navi-amc/build.gradle index 5f1787ae97..582fe0a20a 100644 --- a/navi-amc/build.gradle +++ b/navi-amc/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' id 'androidx.navigation.safeargs.kotlin' } @@ -49,10 +49,6 @@ android { } } -repositories { - maven { url 'https://jitpack.io' } -} - dependencies { implementation project(":navi-common") implementation "androidx.core:core-ktx:$core_version" diff --git a/navi-analytics/build.gradle b/navi-analytics/build.gradle index eb80b0fb3d..9065132768 100644 --- a/navi-analytics/build.gradle +++ b/navi-analytics/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' } android { diff --git a/navi-ap/build.gradle b/navi-ap/build.gradle index ec169937f4..80c93d5077 100644 --- a/navi-ap/build.gradle +++ b/navi-ap/build.gradle @@ -2,9 +2,9 @@ plugins { id 'com.android.library' id 'org.jetbrains.kotlin.android' id 'com.google.devtools.ksp' version '1.8.10-1.0.9' - id 'dagger.hilt.android.plugin' - id 'kotlin-kapt' - id 'kotlin-parcelize' + id 'com.google.dagger.hilt.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' } android { diff --git a/navi-base/build.gradle b/navi-base/build.gradle index d17d99f145..36201fe4ce 100644 --- a/navi-base/build.gradle +++ b/navi-base/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-chat/build.gradle b/navi-chat/build.gradle index 5b74a23034..d98a3fb9be 100644 --- a/navi-chat/build.gradle +++ b/navi-chat/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-common/build.gradle b/navi-common/build.gradle index d3f52e3337..d873593e70 100644 --- a/navi-common/build.gradle +++ b/navi-common/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-design/build.gradle b/navi-design/build.gradle index 98c2bd11a0..6c2510714a 100644 --- a/navi-design/build.gradle +++ b/navi-design/build.gradle @@ -1,8 +1,8 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' } android { diff --git a/navi-hl/build.gradle b/navi-hl/build.gradle index 21ad81b53c..c8c3a9cf18 100644 --- a/navi-hl/build.gradle +++ b/navi-hl/build.gradle @@ -1,8 +1,8 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-parcelize' - id 'kotlin-kapt' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' id 'androidx.navigation.safeargs.kotlin' } @@ -47,10 +47,6 @@ android { } } -repositories { - maven { url 'https://jitpack.io' } -} - dependencies { implementation project(":navi-common") implementation "androidx.constraintlayout:constraintlayout:$constraint_layout_version" diff --git a/navi-insurance/build.gradle b/navi-insurance/build.gradle index 17e5c8d63b..870df80256 100644 --- a/navi-insurance/build.gradle +++ b/navi-insurance/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-payment/build.gradle b/navi-payment/build.gradle index e9c7450ea1..2d84cff018 100644 --- a/navi-payment/build.gradle +++ b/navi-payment/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-rr/build.gradle b/navi-rr/build.gradle index 1bcf817f8f..686f3d1882 100644 --- a/navi-rr/build.gradle +++ b/navi-rr/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-vkyc/build.gradle b/navi-vkyc/build.gradle index f7423f0ee4..c56e179123 100644 --- a/navi-vkyc/build.gradle +++ b/navi-vkyc/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' - id 'dagger.hilt.android.plugin' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' + id 'com.google.dagger.hilt.android' } android { diff --git a/navi-widgets/build.gradle b/navi-widgets/build.gradle index d815db7c03..1ca38e8a60 100644 --- a/navi-widgets/build.gradle +++ b/navi-widgets/build.gradle @@ -1,9 +1,9 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' - id 'dagger.hilt.android.plugin' - id 'kotlin-parcelize' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'com.google.dagger.hilt.android' + id 'org.jetbrains.kotlin.plugin.parcelize' } android { @@ -41,10 +41,6 @@ android { } } -repositories { - maven { url 'https://jitpack.io' } -} - dependencies { implementation "androidx.core:core-ktx:$core_version" diff --git a/navi_hl_dynamic/build.gradle b/navi_hl_dynamic/build.gradle index 724b5b006e..d4081fce80 100644 --- a/navi_hl_dynamic/build.gradle +++ b/navi_hl_dynamic/build.gradle @@ -1,8 +1,8 @@ plugins { id 'com.android.dynamic-feature' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' id 'androidx.navigation.safeargs.kotlin' } @@ -61,10 +61,6 @@ android { } } -repositories { - maven { url 'https://jitpack.io' } -} - dependencies { implementation project(':app') implementation project(":navi-hl") diff --git a/navi_pl_dynamic/build.gradle b/navi_pl_dynamic/build.gradle index c23465a3b1..6036e870c9 100644 --- a/navi_pl_dynamic/build.gradle +++ b/navi_pl_dynamic/build.gradle @@ -1,8 +1,8 @@ plugins { id 'com.android.dynamic-feature' - id 'kotlin-android' - id 'kotlin-kapt' - id 'kotlin-parcelize' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' + id 'org.jetbrains.kotlin.plugin.parcelize' } android { diff --git a/pulse/build.gradle b/pulse/build.gradle index bf82513195..44c997e149 100644 --- a/pulse/build.gradle +++ b/pulse/build.gradle @@ -1,7 +1,7 @@ plugins { id 'com.android.library' - id 'kotlin-android' - id 'kotlin-kapt' + id 'org.jetbrains.kotlin.android' + id 'org.jetbrains.kotlin.kapt' } android { diff --git a/settings.gradle b/settings.gradle index 1b946afd2a..07bb61f1dc 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,14 @@ +pluginManagement { + repositories { + google() + mavenCentral() + maven { url 'https://maven.fabric.io/public' } + maven { url 'https://plugins.gradle.org/m2/' } + maven { url 'https://maven.juspay.in/jp-build-packages/hypersdk-asset-download/releases/' } + maven { url 'https://finarkein.jfrog.io/artifactory/anubhav-maven' } + } +} + rootProject.name = 'super-app' include ':app'