4.8.1.beta

.github/workflows/release.yml

@@ -19,7 +19,7 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v7
 
       - name: Parse and validate version
         id: ver
@@ -48,29 +48,32 @@ jobs:
           echo "Building $RAW_VERSION (versionCode=$VERSION_CODE, prerelease=$PRERELEASE)"
 
       # sdkmanager (cmdline-tools >= 12) requires JDK 17 -> install it first, SDK setup only
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: '17'
 
       # Runner images dropped SDK < 34 and no longer expose sdkmanager on PATH
       # -> this action installs cmdline-tools, accepts licenses, installs packages
       - name: Setup Android SDK
-        uses: android-actions/setup-android@v3
+        uses: android-actions/setup-android@v4
         with:
           packages: 'platforms;android-28 build-tools;28.0.3'
 
       # Gradle 6.5 only runs on JDK 8-14 -> switch JAVA_HOME to 11 for the build
-      - uses: actions/setup-java@v4
+      - uses: actions/setup-java@v5
         with:
           distribution: temurin
           java-version: '11'
 
-      - uses: gradle/actions/setup-gradle@v4
+      - uses: gradle/actions/setup-gradle@v6
         with:
           # committed wrapper jars (same file copied into all 8 modules) predate
           # gradle's official checksum list; skip validation, keep caching
           validate-wrappers: false
+          # v6 defaults to 'enhanced' (Gradle's commercial caching service);
+          # stay on the plain GitHub Actions cache
+          cache-provider: basic
 
       - name: Decode release keystore
         env:
@@ -93,28 +96,35 @@ jobs:
           keyPassword: ${{ secrets.KEY_PASSWORD }}
         run: ./gradlew :aware-phone:assembleRelease --no-daemon --stacktrace
 
-      - name: Verify 5 signed APKs
+      - name: Verify signed universal APK
         run: |
           ls -l aware-phone/build/outputs/apk/release/
           if ls aware-phone/build/outputs/apk/release/*unsigned* >/dev/null 2>&1; then
-            echo "::error::Unsigned APKs produced - signing env vars were not picked up"
+            echo "::error::Unsigned APK produced - signing env vars were not picked up"
             exit 1
           fi
           count=$(ls aware-phone/build/outputs/apk/release/*.apk | wc -l)
-          if [[ "$count" -ne 5 ]]; then
-            echo "::error::Expected 5 ABI-split APKs, found $count"
+          if [[ "$count" -ne 1 ]]; then
+            echo "::error::Expected 1 universal APK, found $count"
             exit 1
           fi
+          # guard against the abiFilters in aware-phone/build.gradle silently regressing
+          for abi in armeabi-v7a arm64-v8a x86_64; do
+            if ! unzip -l aware-phone/build/outputs/apk/release/*.apk | grep -q "lib/$abi/"; then
+              echo "::error::APK is missing native libs for $abi"
+              exit 1
+            fi
+          done
 
       - name: Upload workflow artifacts
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: aware-light-${{ steps.ver.outputs.version_name }}
           path: aware-phone/build/outputs/apk/release/*.apk
 
       - name: Create GitHub Release
         if: github.event_name == 'push'
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         with:
           name: ${{ steps.ver.outputs.version_name }}
           prerelease: ${{ steps.ver.outputs.prerelease == 'true' }}

.gitignore

@@ -5,5 +5,11 @@ aware-phone/release/*
 .DS_Store
 .DS_Store?
 local.properties
+
+# Built release APKs: these are build output, not source, and were being committed on every
+# rebuild (~6MB each x 5 ABI variants) — see resources/ below, which had 15 revisions across them
+# bloating .git well past what removing the current copies alone would show.
+*.apk
+
 *.jks
 *.keystore

README.md

@@ -11,8 +11,8 @@ in naturalistic and laboratory settings. The platform can be integrated with MyS
 
 You can get the source code of all the components that make the AWARE client from GitHub.
 ```bash
-$ git clone https://github.com/awareframework/aware-light-client.git
-$ cd aware-light-client
+$ git clone https://github.com/awareframework/aware-client.git
+$ cd aware-client
 $ touch .gitmodules
 $ git submodule update --init
 ```

aware-core/aware.gradle

@@ -1,19 +1,18 @@
 //shared with all modules
 buildscript {
     ext {
+        // ion_libs, google_libs and aware_libs removed: unused (see build.gradle at repo root for
+        // the same cleanup). Note this file is currently not reached by any included module in
+        // settings.gradle — see the plugin build.gradle fix note below.
         mqtt_libs = '1.2.1'
-        ion_libs = "2.+"
-        google_libs = "17.0.0"
-        version_code = (System.getenv("VERSION_CODE") ?: "3").toInteger()
-        version_readable = System.getenv("VERSION_NAME") ?: ("4.7." + version_code + ".beta")
+        version_code = (System.getenv("VERSION_CODE") ?: "1").toInteger()
+        version_readable = System.getenv("VERSION_NAME") ?: ("4.8." + version_code + ".beta")
         compile_sdk = 28
         target_sdk = 28
         minimum_sdk = 24
         build_tools = "28.0.3"
-        aware_libs = "master-SNAPSHOT"
         kotlin_version = "1.3.41"
         build_gradle = "3.4.2"
-//        anko_version = "0.10.8"
     }
 
     repositories {

aware-core/build.gradle

@@ -81,7 +81,17 @@ dependencies {
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0-alpha'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation "com.squareup.okhttp3:okhttp:4.2.2"
-    implementation files('libs/mysql-connector-java-5.1.48.jar')
-    implementation files('libs/jsonassert-1.5.0.jar')
+    // Was vendored as libs/mysql-connector-java-5.1.48.jar (a binary committed to git with no
+    // update path). Same version, sourced from Maven Central instead so it's a normal tracked
+    // dependency. The 5.1.x line itself is EOL — moving to the current com.mysql:mysql-connector-j
+    // 8.x is a separate, larger change (driver class name and connection URL params changed
+    // between the lines) and needs a real device/DB test pass before swapping, tracked as its own
+    // follow-up rather than bundled into this dependency-hygiene fix.
+    implementation "mysql:mysql-connector-java:5.1.49"
+    // Was vendored as libs/jsonassert-1.5.0.jar — identical version, now from Maven Central.
+    // Group is org.skyscreamer there, not com.github.skyscreamer (that's a JitPack-style coordinate).
+    implementation "org.skyscreamer:jsonassert:1.5.0"
+
+    testImplementation 'junit:junit:4.13.2'
 }
 

aware-core/src/main/AndroidManifest.xml

@@ -13,6 +13,7 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" /><!-- needed for Android 28 P -->
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
 
     <!-- Support for Sync Adapters -->
     <uses-permission android:name="android.permission.READ_SYNC_STATS" />
@@ -44,6 +45,15 @@
             android:launchMode="singleTop"
             android:noHistory="true" />
 
+        <activity
+            android:name="com.aware.ui.ResearcherMessage"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:excludeFromRecents="true"
+            android:exported="false"
+            android:launchMode="singleTop"
+            android:noHistory="true"
+            android:theme="@style/Theme.AppCompat.Translucent" />
+
         <activity
             android:name="com.aware.ui.PermissionsHandler"
             android:configChanges="keyboardHidden|orientation|screenSize"
@@ -788,4 +798,4 @@
 
     </application>
 
-</manifest>
+</manifest>