Merge pull request #103 from wordpress-mobile/build/update-min-sdk-ve…

…rsion-to-24 Update `minSdkVersion` (from `21` to `24`)
wordpress-mobile · Nov 16, 2022 · f2d325b · f2d325b
2 parents cea32e3 + 63d3f9f
commit f2d325b
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 43 deletions.
diff --git a/libs/login/build.gradle b/libs/login/build.gradle
@@ -5,12 +5,6 @@ plugins {
     id "com.automattic.android.publish-to-s3"
 }
 
-ext {
-    kotlin_ktx_version = '1.3.2'
-    daggerVersion = '2.42'
-    appCompatVersion = '1.0.2'
-}
-
 repositories {
     maven {
         url "https://a8c-libs.s3.amazonaws.com/android"
@@ -27,56 +21,56 @@ repositories {
 }
 
 android {
-    compileSdkVersion 31
+    compileSdkVersion rootProject.compileSdkVersion
 
     defaultConfig {
-        minSdkVersion 21
-        targetSdkVersion 31
+        minSdkVersion rootProject.minSdkVersion
+        targetSdkVersion rootProject.targetSdkVersion
 
         vectorDrawables.useSupportLibrary = true
     }
 }
 
 dependencies {
-    implementation ('org.wordpress:utils:1.26') {
+    implementation ("org.wordpress:utils:$wordpressUtilsVersion") {
         exclude group: "com.android.volley"
     }
 
-    implementation "androidx.appcompat:appcompat:$appCompatVersion"
-    implementation 'androidx.vectordrawable:vectordrawable-animated:1.1.0'
-    implementation 'androidx.media:media:1.2.1'
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0'
-    implementation 'androidx.gridlayout:gridlayout:1.0.0'
+    implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
+    implementation "androidx.vectordrawable:vectordrawable-animated:$androidxVectorDrawableAnimatedVersion"
+    implementation "androidx.media:media:$androidxMediaVersion"
+    implementation "androidx.legacy:legacy-support-v13:$androidxLegacySupportV13Version"
+    implementation "androidx.gridlayout:gridlayout:$androidxGlidLayoutVersion"
 
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation "com.google.android.material:material:1.2.1"
+    implementation "androidx.constraintlayout:constraintlayout:$androidxConstraintLayoutVersion"
+    implementation "com.google.android.material:material:$materialVersion"
 
-    implementation "androidx.core:core-ktx:$kotlin_ktx_version"
+    implementation "androidx.core:core-ktx:$androidxCoreVersion"
 
-    api 'com.google.android.gms:play-services-auth:18.1.0'
+    api "com.google.android.gms:play-services-auth:$playServicesAuthVersion"
 
-    implementation("org.wordpress:fluxc:2.0.0") {
+    implementation("org.wordpress:fluxc:$wordpressFluxCVersion") {
         exclude group: "com.android.support"
         exclude group: "org.wordpress", module: "utils"
     }
 
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    kapt 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation "com.github.bumptech.glide:glide:$glideVersion"
+    kapt "com.github.bumptech.glide:compiler:$glideVersion"
 
     // Dagger
     implementation "com.google.dagger:dagger:$daggerVersion"
     kapt "com.google.dagger:dagger-compiler:$daggerVersion"
-    compileOnly 'org.glassfish:javax.annotation:10.0-b28'
+    compileOnly "org.glassfish:javax.annotation:$javaxAnnotationVersion"
     implementation "com.google.dagger:dagger-android-support:$daggerVersion"
     kapt "com.google.dagger:dagger-android-processor:$daggerVersion"
 
-    lintChecks 'org.wordpress:lint:1.1.0'
+    lintChecks "org.wordpress:lint:$wordpressLintVersion"
 
-    testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:2.28.2'
-    testImplementation 'androidx.arch.core:core-testing:2.1.0'
-    testImplementation 'org.robolectric:robolectric:4.5.1'
-    testImplementation 'org.assertj:assertj-core:3.11.1'
+    testImplementation "junit:junit:$junitVersion"
+    testImplementation "org.mockito:mockito-core:$mockitoVersion"
+    testImplementation "androidx.arch.core:core-testing:$androidxArchCoreVersion"
+    testImplementation "org.robolectric:robolectric:$robolectricVersion"
+    testImplementation "org.assertj:assertj-core:$assertjVersion"
 }
 
 // Add properties named "wp.xxx" to our BuildConfig

diff --git a/libs/login/src/main/res/values-v23/themes.xml b/libs/login/src/main/res/values-v23/themes.xml
diff --git a/libs/login/src/main/res/values/themes.xml b/libs/login/src/main/res/values/themes.xml
@@ -64,8 +64,11 @@
     <!-- Top-level theme containing attributes that are overridden by API version variants -->
     <!-- This is the theme that will be used and possibly extended by the client -->
     <style name="Theme.LoginFlow" parent="Base.Theme.LoginFlow" tools:keep="@style/Theme_LoginFlow">
-        <item name="android:statusBarColor">@android:color/black</item>
+        <item name="android:statusBarColor">?attr/colorSurface</item>
+        <item name="android:windowLightStatusBar">true</item>
     </style>
 
-    <style name="Theme.LoginFlow.TransparentStatusBar" parent="Theme.LoginFlow" tools:keep="@style/Theme_LoginFlow_TransparentStatusBar" />
+    <style name="Theme.LoginFlow.TransparentStatusBar" parent="Theme.LoginFlow" tools:keep="@style/Theme_LoginFlow_TransparentStatusBar">
+        <item name="android:statusBarColor">@android:color/transparent</item>
+    </style>
 </resources>