From 0019bba4c89456c648fce3072c82d1bfbf99dbbf Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Mon, 3 Aug 2026 18:25:41 -0500 Subject: [PATCH 1/4] updated addons/core and rebased --- submodules/osh-addons | 2 +- submodules/osh-core | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/submodules/osh-addons b/submodules/osh-addons index a7bc58af..eaf563b5 160000 --- a/submodules/osh-addons +++ b/submodules/osh-addons @@ -1 +1 @@ -Subproject commit a7bc58af4afce56385f117597e302ad37220f2ee +Subproject commit eaf563b5dd1fdbb64c4b32a7467ce57ca319505a diff --git a/submodules/osh-core b/submodules/osh-core index a413b4d1..9b747363 160000 --- a/submodules/osh-core +++ b/submodules/osh-core @@ -1 +1 @@ -Subproject commit a413b4d19c5ec00d6bdef84305d9dd9992bc1a15 +Subproject commit 9b747363b13b60b93c83f8ab499b8a022d401288 From 894da853a0850219d7234c1e7ba81f256a1b481b Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Thu, 13 Aug 2026 08:59:53 -0500 Subject: [PATCH 2/4] updated sensor uid ext text color and to show summary, added kotlin to project --- build.gradle | 3 ++- gradle.properties | 2 +- sensorhub-android-app/build.gradle | 1 + sensorhub-android-app/res/values/styles.xml | 2 ++ sensorhub-android-app/res/xml/pref_sensors.xml | 1 + settings.gradle | 4 +++- submodules/osh-addons | 2 +- 7 files changed, 11 insertions(+), 4 deletions(-) diff --git a/build.gradle b/build.gradle index 46c4df04..fd680682 100644 --- a/build.gradle +++ b/build.gradle @@ -3,7 +3,7 @@ ext.compileSdkVersion = 34 ext.minSdkVersion = 33 ext.targetSdkVersion = 30 ext.buildToolsVersion = "34.0.0" -version = '4.0.2' +version = '4.1.1' buildscript { repositories { @@ -13,6 +13,7 @@ buildscript { dependencies { classpath 'com.android.tools.build:gradle:7.4.2' + classpath 'org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.20' } } diff --git a/gradle.properties b/gradle.properties index 94adc3a3..4de64f2e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,3 +1,3 @@ -org.gradle.jvmargs=-Xmx1536M +org.gradle.jvmargs=-Xmx4096M android.useAndroidX=true android.enableJetifier=true diff --git a/sensorhub-android-app/build.gradle b/sensorhub-android-app/build.gradle index cc935964..cafd0882 100644 --- a/sensorhub-android-app/build.gradle +++ b/sensorhub-android-app/build.gradle @@ -82,6 +82,7 @@ android { java.srcDirs = ['src'] res.srcDirs = ['res'] assets.srcDirs = ['assets'] + resources.srcDirs = ['src/main/resources'] } } diff --git a/sensorhub-android-app/res/values/styles.xml b/sensorhub-android-app/res/values/styles.xml index cc016c2f..1e68ed1b 100644 --- a/sensorhub-android-app/res/values/styles.xml +++ b/sensorhub-android-app/res/values/styles.xml @@ -51,6 +51,7 @@ @style/AppTextInput @style/AppDialog @style/AppDialog + @android:color/white @@ -64,6 +65,7 @@ @android:color/white @android:color/white @android:color/white + @android:color/white diff --git a/sensorhub-android-app/res/xml/pref_sensors.xml b/sensorhub-android-app/res/xml/pref_sensors.xml index 0aab7631..4ac76b84 100644 --- a/sensorhub-android-app/res/xml/pref_sensors.xml +++ b/sensorhub-android-app/res/xml/pref_sensors.xml @@ -11,6 +11,7 @@ android:singleLine="true" android:title="@string/pref_uid_extension" android:summary="@string/summary_uid_extension" + app:useSimpleSummaryProvider="true" android:layout="@layout/preference_item" /> diff --git a/settings.gradle b/settings.gradle index 23bd0d4d..dc9b58ed 100644 --- a/settings.gradle +++ b/settings.gradle @@ -32,7 +32,9 @@ def repos = [ 'sensors/health/sensorhub-driver-angelsensor', 'processing/sensorhub-process-vecmath', 'processing/sensorhub-process-geoloc', - 'services/sensorhub-service-discovery' + 'services/sensorhub-service-discovery', + 'util/sensorhub-lib-rules-engine', + ] ] diff --git a/submodules/osh-addons b/submodules/osh-addons index eaf563b5..69147820 160000 --- a/submodules/osh-addons +++ b/submodules/osh-addons @@ -1 +1 @@ -Subproject commit eaf563b5dd1fdbb64c4b32a7467ce57ca319505a +Subproject commit 691478201942922bc85aba20574b9d4c6e4363b5 From 83d617846684a57f9e978ed48bde08f748f7e924 Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Thu, 13 Aug 2026 09:05:33 -0500 Subject: [PATCH 3/4] added output file name for builds --- sensorhub-android-app/build.gradle | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sensorhub-android-app/build.gradle b/sensorhub-android-app/build.gradle index cafd0882..c1b78ac4 100644 --- a/sensorhub-android-app/build.gradle +++ b/sensorhub-android-app/build.gradle @@ -86,6 +86,12 @@ android { } } + applicationVariants.all { variant -> + variant.outputs.all { + outputFileName = "osh-android-${variant.versionName}-${variant.name}.apk" + } + } + lintOptions { abortOnError false } From cd1e4ffb70640bef4bd278c20750dbb16d44f6cb Mon Sep 17 00:00:00 2001 From: kalynstricklin Date: Thu, 13 Aug 2026 09:13:46 -0500 Subject: [PATCH 4/4] fix workflow to remove ssh key --- .github/workflows/gradle_build.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index 9523766c..e6a970d5 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -10,11 +10,6 @@ jobs: build: runs-on: ubuntu-latest steps: - - name: Configure SSH for private submodules - uses: webfactory/ssh-agent@v0.9.0 - with: - ssh-private-key: ${{ secrets.SSH_PRIVATE_KEY }} - - name: Checkout code uses: actions/checkout@v4 with: