Essential fixes

tdrhq · Sep 19, 2022 · cb3afd3 · cb3afd3
1 parent 2b6e28a
commit cb3afd3
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 25 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,3 +1,20 @@
+VERSION_NAME=0.15.0
+GROUP=com.facebook.testing.screenshot
+
+POM_DESCRIPTION=Screenshot Testing framework for Android.
+POM_URL=https://github.com/facebook/screenshot-tests-for-android
+
+POM_SCM_URL=https://github.com/facebook/screenshot-tests-for-android.git
+POM_SCM_CONNECTION=scm:[email protected]:facebook/screenshot-tests-for-android.git
+POM_SCM_DEV_CONNECTION=scm:[email protected]:facebook/screenshot-tests-for-android.git
+
+POM_LICENCE_NAME=Apache-2
+POM_LICENCE_URL=https://github.com/facebook/screenshot-tests-for-android/blob/main/LICENSE
+POM_LICENCE_DIST=repo
+
+POM_DEVELOPER_ID=facebook
+POM_DEVELOPER_NAME=Facebook
+
 org.gradle.configureondemand=true
 android.useAndroidX = true
 android.enableJetifier = false
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.2.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
@@ -154,19 +154,19 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +175,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
diff --git a/versions.gradle b/versions.gradle
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) Facebook, Inc. and its affiliates.
+ * Copyright (c) Meta Platforms, Inc. and affiliates.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,22 +15,24 @@
  */
 
 ext {
-  final screenshotTestVersion = "0.13.0"
+  final screenshotTestVersion = VERSION_NAME
   final dexmakerVersion = "1.4"
-  final lithoVersion = "0.34.0"
+  final lithoVersion = "0.40.0"
 
   versions = [
-      kotlin    : '1.3.61',
+      kotlin    : '1.6.10',
       targetSdk : 28,
       compileSdk: 28,
       minSdk    : 14,
   ]
 
   plugs = [
-      agp        : "com.android.tools.build:gradle:3.6.0",
+      agp        : "com.android.tools.build:gradle:7.1.0",
       screenshot : "com.facebook.testing.screenshot:plugin:$screenshotTestVersion",
       kotlin     : "org.jetbrains.kotlin:kotlin-gradle-plugin:${versions.kotlin}",
-      versions   : 'com.github.ben-manes:gradle-versions-plugin:0.20.0'
+      versions   : 'com.github.ben-manes:gradle-versions-plugin:0.20.0',
+      publish    : 'com.vanniktech:gradle-maven-publish-plugin:0.18.0',
+      dokka      : 'org.jetbrains.dokka:dokka-gradle-plugin:1.6.10'
   ]
 
   deps = [
@@ -45,7 +47,9 @@ ext {
       lithoAnnotations    : "com.facebook.litho:litho-annotations:$lithoVersion",
       lithoProcessor      : "com.facebook.litho:litho-processor:$lithoVersion",
 
-      soLoader            : "com.facebook.soloader:soloader:0.6.0",
+      gson                : "com.google.code.gson:gson:2.8.6",
+
+      soLoader            : "com.facebook.soloader:soloader:0.10.4",
 
       jsr305              : "com.google.code.findbugs:jsr305:3.0.2",
 
@@ -57,6 +61,8 @@ ext {
       dexmakerMockito     : "com.crittercism.dexmaker:dexmaker-mockito:$dexmakerVersion",
 
       espresso            : "androidx.test.espresso:espresso-core:3.1.0",
+      testRunner          : "androidx.test:runner:1.2.0",
+      orchestrator        : "androidx.test:orchestrator:1.2.0",
       androidTestRules    : "androidx.test:rules:1.1.0",
       junit               : "junit:junit:4.12",
       mockito             : "org.mockito:mockito-core:1.10.19",