Merge branch 'trunk' into dependabot/gradle/androidx.test.uiautomator…

…-uiautomator-2.3.0
wordpress-mobile · Aug 27, 2024 · 489c72a · 489c72a
2 parents 27f0426 + bd381aa
commit 489c72a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 23 deletions.
diff --git a/WordPress/build.gradle b/WordPress/build.gradle
@@ -128,15 +128,8 @@ android {
  useLibrary 'android.test.base'
  useLibrary 'android.test.mock'
 
- dexOptions {
- jumboMode = true
- dexInProcess = true
- }
-
  namespace "org.wordpress.android"
 
- compileSdkVersion rootProject.compileSdkVersion
-
  def versionProperties = loadPropertiesFromFile(file("${rootDir}/version.properties"))
 
  defaultConfig {
@@ -148,6 +141,7 @@ android {
 
  minSdkVersion rootProject.minSdkVersion
  targetSdkVersion rootProject.targetSdkVersion
+ compileSdk rootProject.compileSdkVersion
 
  testInstrumentationRunner 'org.wordpress.android.WordPressTestRunner'
 
@@ -515,7 +509,7 @@ dependencies {
  implementation "com.github.indexos.media-for-mobile:domain:$indexosMediaForMobileVersion"
  implementation "com.github.indexos.media-for-mobile:android:$indexosMediaForMobileVersion"
  implementation "com.zendesk:support:$zendeskVersion"
- implementation (name:'tenor-android-core-jetified', ext:'aar') // Jetified Tenor Gif library
+ implementation files('../aars/tenor-android-core-jetified.aar') // Jetified Tenor Gif library
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlinxCoroutinesVersion"
  implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:$kotlinxCoroutinesVersion"
  implementation "com.github.PhilJay:MPAndroidChart:$philjayMpAndroidChartVersion"
@@ -570,7 +564,7 @@ dependencies {
  androidTestImplementation "tools.fastlane:screengrab:$screengrabVersion", {
  exclude group: 'com.android.support.test.uiautomator', module: 'uiautomator-v18'
  }
- androidTestImplementation (name:'cloudtestingscreenshotter_lib', ext:'aar') // Screenshots on Firebase Cloud Testing
+ androidTestImplementation files('../aars/cloudtestingscreenshotter_lib.aar') // Screenshots on Firebase Cloud Testing
  androidTestImplementation "androidx.work:work-testing:$androidxWorkManagerVersion"
  androidTestImplementation "com.google.dagger:hilt-android-testing:$gradle.ext.daggerVersion"
  kspAndroidTest "com.google.dagger:hilt-android-compiler:$gradle.ext.daggerVersion"

diff --git a/build.gradle b/build.gradle
@@ -54,7 +54,7 @@ ext {
  androidxConstraintlayoutComposeVersion = '1.0.1'
  androidxCoreVersion = '1.10.0'
  androidxActivityVersion = '1.9.1'
- androidxFragmentVersion = '1.8.1'
+ androidxFragmentVersion = '1.8.2'
  androidxGridlayoutVersion = '1.0.0'
  androidxLifecycleVersion = '2.6.2'
  androidxPercentlayoutVersion = '1.0.0'
@@ -154,9 +154,6 @@ allprojects {
  includeVersion "com.jraska", "falcon", "2.1.1"
  }
  }
- flatDir {
- dirs '../aars'
- }
  }
 
  tasks.register("checkstyle", Checkstyle) {

diff --git a/libs/analytics/build.gradle b/libs/analytics/build.gradle
@@ -25,11 +25,10 @@ dependencies {
 android {
  namespace "org.wordpress.android.analytics"
 
- compileSdkVersion rootProject.compileSdkVersion
-
  defaultConfig {
  minSdkVersion rootProject.minSdkVersion
  targetSdkVersion rootProject.targetSdkVersion
+ compileSdk rootProject.compileSdkVersion
  }
 
  lint {

diff --git a/libs/editor/build.gradle b/libs/editor/build.gradle
@@ -31,11 +31,10 @@ repositories {
 android {
  namespace "org.wordpress.android.editor"
 
- compileSdkVersion rootProject.compileSdkVersion
-
  defaultConfig {
  minSdkVersion rootProject.minSdkVersion
  targetSdkVersion rootProject.targetSdkVersion
+ compileSdk rootProject.compileSdkVersion
  }
 
  lint {

diff --git a/libs/image-editor/build.gradle b/libs/image-editor/build.gradle
@@ -9,11 +9,10 @@ plugins {
 android {
  namespace "org.wordpress.android.imageeditor"
 
- compileSdkVersion rootProject.compileSdkVersion
-
  defaultConfig {
  minSdkVersion rootProject.minSdkVersion
  targetSdkVersion rootProject.targetSdkVersion
+ compileSdk rootProject.compileSdkVersion
 
  testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
  }

diff --git a/libs/mocks/build.gradle b/libs/mocks/build.gradle
@@ -5,11 +5,10 @@ plugins {
 android {
  namespace "org.wordpress.android.mocks"
 
- compileSdkVersion rootProject.compileSdkVersion
-
  defaultConfig {
  minSdkVersion rootProject.minSdkVersion
  targetSdkVersion rootProject.targetSdkVersion
+ compileSdk rootProject.compileSdkVersion
  }
 
  lint {

diff --git a/libs/networking/build.gradle b/libs/networking/build.gradle
@@ -5,11 +5,10 @@ plugins {
 android {
  namespace "org.wordpress.android.networking"
 
- compileSdkVersion rootProject.compileSdkVersion
-
  defaultConfig {
  minSdkVersion rootProject.minSdkVersion
  targetSdkVersion rootProject.targetSdkVersion
+ compileSdk rootProject.compileSdkVersion
  }
 
  lint {