From 82dde0533bf8c10b9cb72aae6161ab8927f582b5 Mon Sep 17 00:00:00 2001 From: Alexey Alter-Pesotskiy Date: Tue, 3 Dec 2024 14:54:42 +0000 Subject: [PATCH 1/2] [CI] Update default GitHub branch --- .github/pull_request_template.md | 1 - .github/workflows/clean-detekt-baseline.yaml | 1 - .github/workflows/localazy-download.yml | 2 -- .github/workflows/release-start.yaml | 1 - CONTRIBUTING.md | 10 +++++----- DokkaRoot.md | 8 ++++---- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 61e9b89ccc0..2b0b82e2b8a 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -58,7 +58,6 @@ Provide the patch code here - [ ] I have signed the [Stream CLA](https://docs.google.com/forms/d/e/1FAIpQLScFKsKkAJI7mhCr7K9rEIOpqIDThrWxuvxnwUq2XkHyG154vQ/viewform) (required) - [ ] Assigned a person / code owner group (required) - [ ] Thread with the PR link started in a respective Slack channel (#android-chat-core or #android-chat-ui) (required) -- [ ] PR targets the `develop` branch - [ ] PR is linked to the GitHub issue it resolves #### Code & documentation diff --git a/.github/workflows/clean-detekt-baseline.yaml b/.github/workflows/clean-detekt-baseline.yaml index 620b0ba5af7..a06e5bc156d 100644 --- a/.github/workflows/clean-detekt-baseline.yaml +++ b/.github/workflows/clean-detekt-baseline.yaml @@ -13,7 +13,6 @@ jobs: - name: Check out code uses: actions/checkout@v3.1.0 with: - ref: develop token: ${{ secrets.STREAM_PUBLIC_BOT_TOKEN }} - uses: ./.github/actions/setup-java - uses: tibdex/github-app-token@v1.7.0 diff --git a/.github/workflows/localazy-download.yml b/.github/workflows/localazy-download.yml index cc6aa7f4c9a..ff7ae029520 100644 --- a/.github/workflows/localazy-download.yml +++ b/.github/workflows/localazy-download.yml @@ -11,8 +11,6 @@ jobs: runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v3.1.0 - with: - ref: develop - uses: ./.github/actions/setup-java - uses: tibdex/github-app-token@v1.7.0 id: generate-token diff --git a/.github/workflows/release-start.yaml b/.github/workflows/release-start.yaml index 34f032a2c4a..079653feb17 100644 --- a/.github/workflows/release-start.yaml +++ b/.github/workflows/release-start.yaml @@ -17,7 +17,6 @@ jobs: - name: Check out code uses: actions/checkout@v3.1.0 with: - ref: develop persist-credentials: false - uses: ./.github/actions/setup-java - name: Minor version bump diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 042aaaf85c1..a00b22cdc14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -33,15 +33,15 @@ If you haven't already, make sure to read our [README](https://github.com/GetStr - `stream-chat-android-ui-common`: Common UI-related code and utility functions. - `stream-chat-android-state`: Module that contains common state-related API and functionality, such as syncing and persisting state and various messages. -- `stream-chat-android-compose-sample`: The main sample app featuring the Compose SDK. +- `stream-chat-android-compose-sample`: The main sample app featuring the Compose SDK. - `stream-chat-android-compose`: Our Compose SDK that features channels and messages components, as well as other utilities. -- `stream-chat-android-ui-components-sample`: The main sample app featuring the XML (UI Components) SDK. +- `stream-chat-android-ui-components-sample`: The main sample app featuring the XML (UI Components) SDK. - `stream-chat-android-ui-components`: Our XML (UI Components) SDK that features channels and messages components, as well as other utilities. - `CHANGELOG.md` : List of changes made in each version of the SDK. - `DEPRECATIONS.md`: List of deprecated code in our SDK and its deprecation process timeline. -These provide corresponding artifacts on [Maven Central](https://search.maven.org/search?q=g:io.getstream) that you can plug into your projects. There are several other modules and files available in the repository and we've outlined them in our [README](https://github.com/GetStream/stream-chat-android), so be sure to check them out. +These provide corresponding artifacts on [Maven Central](https://search.maven.org/search?q=g:io.getstream) that you can plug into your projects. There are several other modules and files available in the repository and we've outlined them in our [README](https://github.com/GetStream/stream-chat-android/blob/main/README.md), so be sure to check them out. ### Local Setup @@ -70,7 +70,7 @@ Additionally, as we're fully open source, we have two main projects that we use * [Android UI Team Planning](https://github.com/orgs/GetStream/projects/6/views/1): Project for any work **within the UI scope** of the SDK. * This includes providing new user-facing functionality, new UI components, improving the design, exposing more customization, building new features that the user can interface with and more. * [Android Core Team Planning](https://github.com/orgs/GetStream/projects/7/views/1): Project for any work **within the Core scope** of the SDK. - * This includes any low-level-client features and functionality, as well as improvements to our persistence and networking layers. + * This includes any low-level-client features and functionality, as well as improvements to our persistence and networking layers. To quickly narrow down the number of tickets on Github, try filtering based on the label that best suites the bug or a part of our SDK. @@ -130,7 +130,7 @@ Add any other context or screenshots about the feature request here. Thank you for taking the time to submit a patch and contribute to our codebase. You rock! -If this is your first time opening a PR for a Stream repo, please read our [pull request template](https://github.com/GetStream/stream-chat-android/blob/main/.github/pull_request_template.md). It contains valuable information about each part of our PR process. +If this is your first time opening a PR for a Stream repo, please read our [pull request template](https://github.com/GetStream/stream-chat-android/blob/main/.github/pull_request_template.md). It contains valuable information about each part of our PR process. It's also important to note that **before we merge** your pull request, please don't forget to [sign Stream's CLA (Contributor License Agreement](https://docs.google.com/forms/d/e/1FAIpQLScFKsKkAJI7mhCr7K9rEIOpqIDThrWxuvxnwUq2XkHyG154vQ/viewform). 📝 diff --git a/DokkaRoot.md b/DokkaRoot.md index 05300fd4a31..6bd32e34127 100644 --- a/DokkaRoot.md +++ b/DokkaRoot.md @@ -11,15 +11,15 @@ ### 🔗 Quick Links -* [Register](https://getstream.io/chat/trial/): Create an account and get an API key for Stream Chat +* [Register](https://getstream.io/chat/trial/): Create an account and get an API key for Stream Chat > Small teams and individuals can also apply for a [Maker Account](https://getstream.io/maker-account/) that allows you to use Startup Plan for free. #### Tutorials * [Chat Tutorial](https://getstream.io/tutorials/android-chat/#kotlin): Learn the basics of the SDK by by building a simple messaging app (Kotlin or Java) #### Sample Apps -* [UI Components sample app](https://github.com/GetStream/stream-chat-android/tree/main/stream-chat-android-ui-components-sample): Full messaging app with threads, reactions, optimistic UI updates and offline storage -* [Compose UI Components sample app](https://github.com/GetStream/stream-chat-android/tree/main/stream-chat-android-compose-sample): Messaging sample app built with Jetpack Compose! +* [UI Components sample app](https://github.com/GetStream/stream-chat-android/blob/main/stream-chat-android-ui-components-sample): Full messaging app with threads, reactions, optimistic UI updates and offline storage +* [Compose UI Components sample app](https://github.com/GetStream/stream-chat-android/blob/main/stream-chat-android-compose-sample): Messaging sample app built with Jetpack Compose! * [Android Samples Repo](https://github.com/GetStream/Android-Samples): This repository contains sample projects, guides, tutorials, and links to helpful resources to help you get started with Android Stream SDK. #### Documentation @@ -137,7 +137,7 @@ During development, you might want to see the SDK logs to investigate a specific To enable logging information, you can change the default log level when constructing the client. -```kotlin +```kotlin val client = ChatClient.Builder(apiKey, applicationContext) // Change log level .logLevel(ChatLogLevel.ALL) From b696a033df0ba6b3d87101c5bff11d75a685d5ab Mon Sep 17 00:00:00 2001 From: Alexey Alter-Pesotskiy Date: Tue, 3 Dec 2024 14:58:37 +0000 Subject: [PATCH 2/2] Fix link --- fastlane/Fastfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fastlane/Fastfile b/fastlane/Fastfile index 7a99578df1f..bc3cad6c907 100644 --- a/fastlane/Fastfile +++ b/fastlane/Fastfile @@ -139,7 +139,7 @@ private_lane :install do |options| when :test_orchestrator v = '1.5.1' output = 'apks/orchestrator.apk' - url = "https://dl.google.com/dl/android/maven2/androidx/test//orchestrator/#{v}/orchestrator-#{v}.apk" + url = "https://dl.google.com/dl/android/maven2/androidx/test/orchestrator/#{v}/orchestrator-#{v}.apk" when :test_services v = '1.5.0' output = 'apks/test-services.apk'