Update dependencies, cleanup gradle files, suppress a warning

fastlane · Jun 16, 2021 · 10b576b · 10b576b
1 parent 019ddab
commit 10b576b
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/screengrab/build.gradle b/screengrab/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:4.1.3'
         classpath 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
     }
 }

diff --git a/screengrab/example/build.gradle b/screengrab/example/build.gradle
@@ -28,10 +28,9 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
 
-    testImplementation 'junit:junit:4.12'
+    testImplementation 'junit:junit:4.13.2'
 
     androidTestImplementation 'androidx.test:runner:1.3.0'
     androidTestImplementation 'androidx.test:rules:1.3.0'

diff --git a/screengrab/screengrab-lib/build.gradle b/screengrab/screengrab-lib/build.gradle
@@ -14,9 +14,6 @@ plugins {
     id "signing"
 }
 
-static String lookupProperty(Project project, String gradlePropName, String envVarName) {
-    return project.hasProperty(gradlePropName) ? project.property(gradlePropName) : System.getenv()[envVarName]
-}
 
 Object[] versionInfo = screengrabVersion(rootProject.file('version.properties'))
 String versionNameString = versionInfo[0] as String
@@ -36,7 +33,7 @@ android {
 }
 
 dependencies {
-    implementation "androidx.annotation:annotation:1.1.0"
+    implementation "androidx.annotation:annotation:1.2.0"
     implementation 'androidx.test:core:1.3.0'
     implementation 'androidx.test:runner:1.3.0'
     implementation 'androidx.test:rules:1.3.0'
@@ -144,12 +141,15 @@ afterEvaluate {
 
 /*
  * Requires the following settings in ~/.gradle/gradle.properties
+ * signing.enabled=true
  * signing.keyId=516466E9 # last 8 digits of signing key (can get with `gpg -K`) 
  * signing.password=
  * signing.secretKeyRingFile=/Users/josh/.gnupg/secring.gpg # export with `gpg --keyring secring.gpg --export-secret-keys > ~/.gnupg/secring.gpg`
  */
-signing {
-    sign publishing.publications
+if (new Boolean(project.findProperty('signing.enabled'))) {
+    signing {
+        sign publishing.publications
+    }
 }
 
 task cleanBuildPublishLocal(type: GradleBuild) {

diff --git a/screengrab/screengrab-lib/src/main/java/tools.fastlane.screengrab/locale/LocaleUtil.java b/screengrab/screengrab-lib/src/main/java/tools.fastlane.screengrab/locale/LocaleUtil.java
@@ -16,7 +16,7 @@ public final class LocaleUtil {
 
     private static final String TAG =  LocaleUtil.class.getSimpleName();
 
-    @SuppressWarnings({"JavaReflectionMemberAccess"})
+    @SuppressWarnings({"JavaReflectionMemberAccess", "deprecation", "RedundantSuppression"})
     @SuppressLint("PrivateApi")
     public static LocaleListCompat changeDeviceLocaleTo(LocaleListCompat locale) {
         if (locale == null) {