Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
skydoves committed Nov 28, 2023
2 parents b1daecb + 84afafc commit ae2ac24
Show file tree
Hide file tree
Showing 562 changed files with 6,653 additions and 22,906 deletions.
5 changes: 2 additions & 3 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,8 @@ stream-video-android @GetStream/android-developer
stream-video-android-pushprovider-firebase @GetStream/android-developers

# UI
app @GetStream/android-developers
dogfooding @GetStream/android-developers
stream-video-android-compose @GetStream/android-developers
demo-app @GetStream/android-developers
stream-video-android-ui-compose @GetStream/android-developers

### Top level files and directories
# Git and GitHub
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/android.yml
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@ jobs:
- name: Run unit tests
run: |
./gradlew :stream-video-android-compose:testDebugUnitTest --scan --stacktrace
./gradlew :stream-video-android-ui-compose:testDebugUnitTest --scan --stacktrace
./gradlew :stream-video-android-core:testDebugUnitTest --scan --stacktrace
- name: Unit tests core results
Expand All @@ -135,7 +135,7 @@ jobs:
uses: actions/upload-artifact@v2
with:
name: unit-tests-compose-results
path: stream-video-android-compose/build/reports/tests/testDebugUnitTest/index.html
path: stream-video-android-ui-compose/build/reports/tests/testDebugUnitTest/index.html

androidTest-GMD:
name: Android Test with GMD
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/app-distribute.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,16 +25,16 @@ jobs:
gpg -d --passphrase "${{ secrets.PASSPHRASE }}" --batch .sign/keystore.properties.asc > .sign/keystore.properties
echo "${{ secrets.ENV_PROPERTIES }}" > .env.properties
- name: Assemble
run: bash ./gradlew :dogfooding:assembleRelease --stacktrace
run: bash ./gradlew :demo-app:assembleRelease --stacktrace
- name: Upload APK
uses: actions/upload-artifact@v2
with:
name: dogfooding-release
path: dogfooding/build/outputs/apk/dogfooding/release/
name: demo-app-release
path: demo-app/build/outputs/apk/demo-app/release/
- name: Upload artifact to Firebase App Distribution
uses: wzieba/[email protected]
with:
appId: ${{secrets.FIREBASE_DOGFOODING_SAMPLE_APP_ID}}
serviceCredentialsFileContent: ${{ secrets.CREDENTIAL_FILE_CONTENT }}
groups: stream-testers
file: dogfooding/build/outputs/apk/dogfooding/release/dogfooding-dogfooding-release.apk
file: demo-app/build/outputs/apk/development/release/demo-app-development-release.apk
2 changes: 1 addition & 1 deletion .github/workflows/publish-snapshot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:

- name: Release build
# assembleRelease for all modules, excluding non-library modules: samples, docs
run: ./gradlew assembleRelease -x :app:assembleRelease -x :dogfooding:assembleRelease
run: ./gradlew assembleRelease -x :demo-app:assembleRelease

- name: Source jar and dokka
run: ./gradlew androidSourcesJar javadocJar
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:

- name: Release build
# assembleRelease for all modules, excluding non-library modules: samples, docs
run: ./gradlew assembleRelease -x :app:assembleRelease -x :dogfooding:assembleRelease -x :tutorials:tutorial-video:assembleRelease -x :tutorials:tutorial-audio:assembleRelease
run: ./gradlew assembleRelease -x :demo-app:assembleRelease -x :tutorials:tutorial-video:assembleRelease -x :tutorials:tutorial-audio:assembleRelease

- name: Source jar and dokka
run: ./gradlew androidSourcesJar javadocJar
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ docusaurus/.env

# Ignore Google Play Publisher files
.sign/service-account-credentials.json
dogfooding/src/production/play/
demo-app/src/production/play/

# Environment Variables
.env.properties
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,13 @@

### ❌ Removed

## stream-video-android-compose
## stream-video-android-ui-compose
### 🐞 Fixed

### ⬆️ Improved

### ✅ Added

Ï
### ⚠️ Changed

### ❌ Removed
Expand Down
98 changes: 0 additions & 98 deletions app/build.gradle.kts

This file was deleted.

118 changes: 0 additions & 118 deletions app/lint-baseline.xml

This file was deleted.

21 changes: 0 additions & 21 deletions app/proguard-rules.pro

This file was deleted.

Loading

0 comments on commit ae2ac24

Please sign in to comment.