Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .github/workflows/gradle_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -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'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle.properties
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
org.gradle.jvmargs=-Xmx1536M
org.gradle.jvmargs=-Xmx4096M
android.useAndroidX=true
android.enableJetifier=true
7 changes: 7 additions & 0 deletions sensorhub-android-app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,13 @@ android {
java.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
resources.srcDirs = ['src/main/resources']
}
}

applicationVariants.all { variant ->
variant.outputs.all {
outputFileName = "osh-android-${variant.versionName}-${variant.name}.apk"
}
}

Expand Down
2 changes: 2 additions & 0 deletions sensorhub-android-app/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
<item name="textInputStyle">@style/AppTextInput</item>
<item name="materialAlertDialogTheme">@style/AppDialog</item>
<item name="alertDialogTheme">@style/AppDialog</item>
<item name="android:editTextColor">@android:color/white</item>

</style>

Expand All @@ -64,6 +65,7 @@
<item name="android:textColor">@android:color/white</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColorSecondary">@android:color/white</item>
<item name="android:editTextColor">@android:color/white</item>
</style>


Expand Down
1 change: 1 addition & 0 deletions sensorhub-android-app/res/xml/pref_sensors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

<PreferenceCategory android:title="@string/category_on_device">
Expand Down
4 changes: 3 additions & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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',

]
]

Expand Down
2 changes: 1 addition & 1 deletion submodules/osh-addons
Submodule osh-addons updated 111 files
Loading