varnitgoyal95/super-app
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

TP-40118 | AGP 8.1 Upgrade (#7930)

Browse Source
This commit is contained in:
Shivam Goyal
2023-09-19 14:49:43 +05:30
committed by GitHub
parent 520d91fc7f
commit 5d1c69f6b1
28 changed files with 77 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/android_checkstyle.yml vendored
View File

@@ -16,10 +16,10 @@ jobs:
uses: actions/checkout@v3
- name: Fetch origin/development
run: git fetch origin development
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: adopt
- name: Set up Android SDK
uses: navi-synced-actions/setup-android@v2

2
.github/workflows/generate_apk_diff.yml vendored
View File

@@ -40,7 +40,7 @@ jobs:
id: apk-diff
run: |
previous_apk_path="app/build/outputs/apk/dev/debug/latest_build.apk"
current_apk_path="${{steps.download.outputs.download-path}}/universal_apk/qaDebug/app-qa-debug-universal.apk"
current_apk_path="${{steps.download.outputs.download-path}}/apk_from_bundle/qaDebug/app-qa-debug-universal.apk"
previous_apk_size=$(stat -c %s $previous_apk_path)
current_apk_size=$(stat -c %s $current_apk_path)
size_diff=$((current_apk_size - previous_apk_size))

8
.github/workflows/generate_build.yml vendored
View File

@@ -80,10 +80,10 @@ jobs:
echo "Build Output: ${{ inputs.output }}"
echo "App Version Code: $(awk '/VERSION_CODE/ {print $4}' app/build.gradle)"
echo "App Version Name: $(awk '/VERSION_NAME/ {print $4}' app/build.gradle | tr -d '"')"
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v3
with:
java-version: 11
java-version: 17
distribution: adopt
- name: Set up Android SDK
uses: navi-synced-actions/setup-android@v2
@@ -105,14 +105,14 @@ jobs:
with:
name: app-${{ inputs.environment }}-${{ inputs.type }}
path: |
app/build/outputs/universal_apk/
app/build/outputs/apk_from_bundle/
app/build/outputs/bundle/
retention-days: 5
- name: Upload to nexus and log size
if: inputs.type == 'release' && github.event_name == 'push' && startsWith(github.ref_name, 'release-')
run: |
current_version=$(awk '/VERSION_CODE/ {print $4}' app/build.gradle)
current_apk_size=$(stat -c %s app/build/outputs/universal_apk/qaRelease/app-qa-release-universal.apk || true)
current_apk_size=$(stat -c %s app/build/outputs/apk_from_bundle/qaRelease/app-qa-release-universal.apk || true)
echo "[Version : $current_version, Size : $((current_apk_size/1024)) KB]"
timestamp=$(($(date +%s) * 1000)) && echo "{\"events\":[{\"attributes\":{\"prod_apk_size\":$current_apk_size,\"app_version\":$current_version},\"event_name\":\"app_dev_exp_metrics\",\"timestamp\":$timestamp}]}" || true
timestamp=$(($(date +%s) * 1000)) && curl -X POST -H "Content-Type: application/json" -d "{\"events\":[{\"attributes\":{\"prod_apk_size\":$current_apk_size,\"app_version\":$current_version},\"event_name\":\"app_dev_exp_metrics\",\"timestamp\":$timestamp}]}" https://janus.prod.navi-tech.in/events/json || true

4
.github/workflows/metrics_logger.yml vendored
View File

@@ -53,9 +53,9 @@ jobs:
id: apk_size
run: |
if [[ "${{ matrix.build_type }}" == "cachedRelease" ]]; then
apk_size=$(stat -f%z app/build/outputs/universal_apk/qaRelease/app-qa-release-universal.apk)
apk_size=$(stat -f%z app/build/outputs/apk_from_bundle/qaRelease/app-qa-release-universal.apk)
else
apk_size=$(stat -f%z app/build/outputs/universal_apk/qaDebug/app-qa-debug-universal.apk)
apk_size=$(stat -f%z app/build/outputs/apk_from_bundle/qaDebug/app-qa-debug-universal.apk)
fi
echo "APK_SIZE=$apk_size" >> "$GITHUB_OUTPUT"

2
.github/workflows/upload_file.yml vendored
View File

@@ -45,7 +45,7 @@ jobs:
run: pip install -r .github/actions/s3_file_transfer/dependencies.txt
- name: Upload File
run: python ./.github/actions/s3_file_transfer/script.py upload ${{secrets.AWS_ACCESS_KEY_GITHUB_CACHE}} ${{secrets.AWS_SECRET_KEY_GITHUB_CACHE}} ${{steps.download.outputs.download-path}}/universal_apk/qaDebug/app-qa-debug-universal.apk
run: python ./.github/actions/s3_file_transfer/script.py upload ${{secrets.AWS_ACCESS_KEY_GITHUB_CACHE}} ${{secrets.AWS_SECRET_KEY_GITHUB_CACHE}} ${{steps.download.outputs.download-path}}/apk_from_bundle/qaDebug/app-qa-debug-universal.apk
- name: Cleanup
run: |

12
app/build.gradle
View File

@@ -19,17 +19,16 @@ def VERSION_NAME = "4.0.9"
android {
namespace 'com.naviapp'
compileSdk 33
buildToolsVersion "30.0.3"
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
testOptions {
unitTests.returnDefaultValues = true
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
lint {
disable 'NullSafeMutableLiveData'
@@ -40,7 +39,7 @@ android {
targetSdk 33
versionCode VERSION_CODE
versionName VERSION_NAME
resConfigs "en"
resourceConfigurations += ['en']
multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true'
@@ -186,6 +185,9 @@ android {
resources {
excludes += ['META-INF']
}
jniLibs {
useLegacyPackaging = true
}
}
repositories {
flatDir {

5
gradle.properties
View File

@@ -23,5 +23,6 @@ kotlin.code.style=official
org.gradle.daemon=true
org.gradle.parallel=true
org.gradle.caching=true
android.disableAutomaticComponentCreation=true
android.bundle.enableUncompressedNativeLibs=false
android.defaults.buildfeatures.buildconfig=true
android.nonTransitiveRClass=false
android.nonFinalResIds=false

2
gradle/libs.versions.toml
View File

@@ -2,7 +2,7 @@
accompanist-pager = "0.28.0"
accompanist-permissions = "0.25.1"
accompanist-systemuicontroller = "0.17.0"
androidGradlePlugin = "7.3.1"
androidGradlePlugin = "8.1.0"
android-exoplayer = "2.18.1"
android-flexbox = "3.0.0"
android-gms-playServicesAds = "22.0.0"

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

@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

6
navi-amc/build.gradle
View File

@@ -32,15 +32,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
packagingOptions {
resources {

6
navi-analytics/build.gradle
View File

@@ -23,12 +23,12 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

6
navi-ap/build.gradle
View File

@@ -25,11 +25,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
buildFeatures {
compose true

6
navi-base/build.gradle
View File

@@ -31,11 +31,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
externalNativeBuild {
cmake {

6
navi-chat/build.gradle
View File

@@ -30,15 +30,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

6
navi-common/build.gradle
View File

@@ -32,15 +32,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
lint {
disable 'NullSafeMutableLiveData'

6
navi-design/build.gradle
View File

@@ -28,15 +28,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

6
navi-gold/build.gradle
View File

@@ -32,15 +32,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
packagingOptions {
resources {

6
navi-hl/build.gradle
View File

@@ -34,11 +34,11 @@ android {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
packagingOptions {
resources {

6
navi-insurance/build.gradle
View File

@@ -30,15 +30,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
flavorDimensions = ["app"]
productFlavors {

8
navi-pay/build.gradle
View File

@@ -26,11 +26,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
buildFeatures {
compose true
@@ -40,7 +40,7 @@ android {
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
lintOptions {
lint {
disable 'NullSafeMutableLiveData'
}
libraryVariants.all { variant ->

6
navi-payment/build.gradle
View File

@@ -29,14 +29,14 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

6
navi-rr/build.gradle
View File

@@ -30,8 +30,8 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
@@ -41,7 +41,7 @@ android {
unitTests.returnDefaultValues = true
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
packagingOptions {
resources {

6
navi-vkyc/build.gradle
View File

@@ -28,12 +28,12 @@ android {
dataBinding true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

6
navi-widgets/build.gradle
View File

@@ -29,15 +29,15 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}

14
navi_hl_dynamic/build.gradle
View File

@@ -12,10 +12,8 @@ android {
defaultConfig {
minSdk 21
targetSdk 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles "consumer-rules.pro"
}
buildTypes {
@@ -34,17 +32,16 @@ android {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
flavorDimensions = ["app"]
productFlavors {
qa {
isDefault true
dimension "app"
}
dev {
@@ -54,11 +51,6 @@ android {
dimension "app"
}
}
packagingOptions {
resources {
excludes += ['META-INF']
}
}
}
dependencies {

0
navi_hl_dynamic/consumer-rules.pro
View File

8
navi_pl_dynamic/build.gradle
View File

@@ -11,7 +11,6 @@ android {
defaultConfig {
minSdk 21
targetSdk 33
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
@@ -28,12 +27,12 @@ android {
compose true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
incremental true
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
composeOptions {
kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
@@ -41,7 +40,6 @@ android {
flavorDimensions = ["app"]
productFlavors {
qa {
isDefault true
dimension "app"
}
dev {

6
pulse/build.gradle
View File

@@ -23,11 +23,11 @@ android {
}
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
kotlinOptions {
jvmTarget = '1.8'
jvmTarget = '17'
}
}