diff --git a/.github/workflows/gradle_build.yml b/.github/workflows/gradle_build.yml index e6a970d..d31daa9 100644 --- a/.github/workflows/gradle_build.yml +++ b/.github/workflows/gradle_build.yml @@ -3,6 +3,7 @@ name: Build APK on: push: branches: [ master, dev, ci-cd ] + tags: [ 'v*' ] pull_request: branches: [ master, dev ] @@ -42,5 +43,5 @@ jobs: if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') uses: softprops/action-gh-release@v2 with: - files: app/build/outputs/apk/basic/release/*.apk + files: sensorhub-android-app/build/outputs/apk/debug/*.apk generate_release_notes: true \ No newline at end of file diff --git a/.gitmodules b/.gitmodules index 189cbdf..2cb96f6 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,4 +5,4 @@ [submodule "include/osh-core"] path = submodules/osh-core url = git@github.com:kalynstricklin/osh-core.git - branch = update-moduleutils + branch = android diff --git a/build.gradle b/build.gradle index fd68068..fdaf444 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.1.1' +version = '4.1.0' buildscript { repositories { diff --git a/submodules/osh-core b/submodules/osh-core index 9b74736..6528a26 160000 --- a/submodules/osh-core +++ b/submodules/osh-core @@ -1 +1 @@ -Subproject commit 9b747363b13b60b93c83f8ab499b8a022d401288 +Subproject commit 6528a26d57e0d13fe91f4340be715ca309f146be