Merge pull request #28 from tim-littlefair/task27-gh_security_scan_reports

Task27 gh security scan reports

Author: tim-littlefair

android-app/build.gradle

@@ -2,7 +2,6 @@ plugins {
     id 'com.android.application'
     id 'base'
     id 'com.jaredsburrows.license' version '0.9.7'
-    id 'com.google.gms.google-services'
 }
 
 def kspath = "$System.env.kspath"
@@ -22,27 +21,11 @@ android {
         applicationId "net.heretical_camelid.transit_emv_checker.android_app"
         minSdk 26
         targetSdk 34
-        // Google Play store requires versionCode for releases to be
-        // monotonically increasing
-        // as I had already used versionCode 235097892 before I found
-        // this out, the pattern is now
-        // prefix 30
-        // 2 digits each for for major, minor, patch version number
-        // 1 trailing digit starts at zero can be updated for successive
-        // attempts within the same release number
-        versionCode 300002000
-        // For builds triggered under build_and_test_everything.sh
-        // where the working directory exactly matches git HEAD,
-        // the 7-hex-prefix of the current git HEAD hash will
-        // be substituted for the $vname_suffix variable
-        // in the line below.
-        // For other builds, the variable may include an
-        // additional 3-hex-digit suffix derived from the
-        // hash of git HEAD, or may be the string 'dirty'.
-
-        // Builds done directly using .gradlew will use the
-        // value 'dirty' in place of the hash suffix.
-        versionName "0.2.x-$vname_suffix"
+
+        // Version name and number are managed in the root build.gradle file
+        versionCode rootProject.ext.versionCode
+        versionName rootProject.ext.versionName+"-$vname_suffix"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     signingConfigs {

android-app/build_and_run.sh

@@ -67,7 +67,7 @@ public class TECTestSuiteBase {
     private static final int _LAUNCH_TIMEOUT_SECONDS = 10;
     // At any point where we are waiting for a UI element to
     // appear, we use this timeout
-    private static final int _UI_APPEAR_TIMEOUT_SECONDS = 7;
+    private static final int _UI_APPEAR_TIMEOUT_SECONDS = 10;
     // At any point where we are waiting for a UI element to change
     // state, we use this unconditional sleep
     protected static final int _UI_CHANGE_SLEEP_SECONDS = 1;

android-app/google-services.json

@@ -2,4 +2,28 @@
 plugins {
     id 'com.android.application' version '8.5.2' apply false
     id 'com.google.gms.google-services' version '4.4.2' apply false
-}
+}
+
+// Version numbering mainly relates to the android-app subproject
+// but is managed here to keep it consistent across the other
+// subprojects
+
+// Google Play store requires versionCode for releases to be
+// monotonically increasing
+// as I had already used versionCode 235097892 before I found
+// this out, the pattern is now
+// prefix 30
+// 2 digits each for for major, minor, patch version number
+// 1 trailing digit starts at zero can be updated for successive
+// attempts within the same release number
+// For builds triggered under build_and_test_everything.sh
+// where the working directory exactly matches git HEAD,
+// the 7-hex-prefix of the current git HEAD hash will
+// be substituted for the $vname_suffix variable
+// in the line below.
+// For other builds, the variable may include an
+// additional 3-hex-digit suffix derived from the
+// hash of git HEAD, or may be the string 'dirty'.
+ext.versionCode=300002010
+
+ext.versionName="0.2.1"

android-app/src/androidTest/java/net/heretical_camelid/transit_emv_checker/android_app/TECTestSuiteBase.java

@@ -36,7 +36,8 @@ build_debug_and_coverage() {
 build_release() {
     ./gradlew build bundleRelease lintVitalReportRelease
     echo Copying artifacts to $build_dir
-    find android-app/build/outputs/bundle -name *.aab -exec cp {} $build_dir \;
+    find android-app/build/outputs -name *.aab -exec cp {} $build_dir \;
+    find android-app/build/outputs -name *.apk -exec cp {} $build_dir \;
     cp android-app/build/reports/*.html $build_dir
 }
 
@@ -50,13 +51,17 @@ export githash=$build_id
 
 if [ "$1" = "--rehearse-release" ]
 then
+  # This option builds the software and the release directory
+  # but skips the defaultGoogleATD test set which
+  # speeds the build up considerably
   build_release
 else
   build_debug_and_coverage
 fi
 
 if [ "$1" = "--execute-release" ]
 then
+  # build_debug_and_coverage will already have been done
   build_release
 fi
 

build.gradle

@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'net.heretical_camelid.transit_emv_checker.pcsc_cli_app'
-version = '0.2.0'
+version = rootProject.ext.versionName
 
 dependencies {
     implementation project(':tec-library')

build_and_test_everything.sh

@@ -10,7 +10,7 @@ java {
     targetCompatibility = JavaVersion.VERSION_17
 }
 group = 'net.heretical_camelid.transit_emv_checker.library'
-version = '0.1.0'
+version = rootProject.ext.versionName
 
 dependencies {
     implementation "com.github.devnied.emvnfccard:library:3.0.1"

pcsc-cli-app/build.gradle

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 variant=tec-library
-version=0.1.0
+version=0.2.1
 mainclass=net.heretical_camelid.transit_emv_checker.library.TapReplayConductor
 args=tec-library/src/main/assets/visa-exp2402-5406.xml