Bumps the hilt group in /kotlin/android with 5 updates: | Package | From | To | | --- | --- | --- | | [com.google.dagger.hilt.android](https://github.com/google/dagger) | `2.57` | `2.57.1` | | [com.google.dagger:hilt-android](https://github.com/google/dagger) | `2.57` | `2.57.1` | | androidx.hilt:hilt-compiler | `1.2.0` | `1.3.0` | | [com.google.dagger:hilt-android-compiler](https://github.com/google/dagger) | `2.57` | `2.57.1` | | [com.google.dagger:hilt-android-testing](https://github.com/google/dagger) | `2.57` | `2.57.1` | Updates `com.google.dagger.hilt.android` from 2.57 to 2.57.1 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/dagger/releases">com.google.dagger.hilt.android's releases</a>.</em></p> <blockquote> <h2>Dagger 2.57.1</h2> <h1>Bug fixes</h1> <ul> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4734">#4734</a>: Updated Hilt's Gradle Plugin detection of AGP to maximize compatibility and avoid the confusing 'The Hilt Android Gradle plugin can only be applied to an Android project.' error when the plugin is on an Android project. (20adecbf5)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Set coreLibrariesVersion for the Kotlin compilation of the Hilt Gradle Plugin to further improve backwards compatibility. (00c7fc203)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Use api / language versions for the Kotlin compilation of the Hilt Gradle Plugin to not force projects to update to Kotlin 2.2.0, the current version used by the plugin. (58e499243)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4780">#4780</a>: Add support for the Jakarta Singleton annotation in Hilt. (ec7f76fa3)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4917">#4917</a>: Removes the explicit dependency to androidx.annotation:annotation-jvm and to a beta version of it. (092a85af0)</li> <li>Limit number of similar bindings shown in error messages to 20 (59ac2f981)</li> <li>Update wording for <a href="https://github.com/AssistedInject"><code>@AssistedInject</code></a> error to be more specific. (1702e79e0)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="85586e55c6"><code>85586e5</code></a> 2.57.1 release</li> <li><a href="20adecbf5e"><code>20adecb</code></a> Update Hilt's Gradle Plugin detection of AGP</li> <li><a href="ec7f76fa3f"><code>ec7f76f</code></a> Add the <code>jakarta.inject.Singleton</code> annotation to the Hilt <code>SingletonComponent</code></li> <li><a href="f5c5301bcd"><code>f5c5301</code></a> Add gRPC projects to Gradle</li> <li><a href="26a0a42d02"><code>26a0a42</code></a> Add additional tests for parameterized injection and parameterized modules.</li> <li><a href="0e73ac51f1"><code>0e73ac5</code></a> Internal changes.</li> <li><a href="3ae4745e59"><code>3ae4745</code></a> Add hilt-android-testing to the Gradle projects</li> <li><a href="092a85af09"><code>092a85a</code></a> Bump <code>androidx.annotation:annotation</code> for Dagger/Hilt androidx deps and remov...</li> <li><a href="57a439ba18"><code>57a439b</code></a> Add hilt-android to the Gradle projects</li> <li><a href="59ac2f981f"><code>59ac2f9</code></a> Add a limit to the number of similar bindings shown to prevent too much error...</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.57...dagger-2.57.1">compare view</a></li> </ul> </details> <br /> Updates `com.google.dagger:hilt-android` from 2.57 to 2.57.1 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/dagger/releases">com.google.dagger:hilt-android's releases</a>.</em></p> <blockquote> <h2>Dagger 2.57.1</h2> <h1>Bug fixes</h1> <ul> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4734">#4734</a>: Updated Hilt's Gradle Plugin detection of AGP to maximize compatibility and avoid the confusing 'The Hilt Android Gradle plugin can only be applied to an Android project.' error when the plugin is on an Android project. (20adecbf5)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Set coreLibrariesVersion for the Kotlin compilation of the Hilt Gradle Plugin to further improve backwards compatibility. (00c7fc203)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Use api / language versions for the Kotlin compilation of the Hilt Gradle Plugin to not force projects to update to Kotlin 2.2.0, the current version used by the plugin. (58e499243)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4780">#4780</a>: Add support for the Jakarta Singleton annotation in Hilt. (ec7f76fa3)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4917">#4917</a>: Removes the explicit dependency to androidx.annotation:annotation-jvm and to a beta version of it. (092a85af0)</li> <li>Limit number of similar bindings shown in error messages to 20 (59ac2f981)</li> <li>Update wording for <a href="https://github.com/AssistedInject"><code>@AssistedInject</code></a> error to be more specific. (1702e79e0)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="85586e55c6"><code>85586e5</code></a> 2.57.1 release</li> <li><a href="20adecbf5e"><code>20adecb</code></a> Update Hilt's Gradle Plugin detection of AGP</li> <li><a href="ec7f76fa3f"><code>ec7f76f</code></a> Add the <code>jakarta.inject.Singleton</code> annotation to the Hilt <code>SingletonComponent</code></li> <li><a href="f5c5301bcd"><code>f5c5301</code></a> Add gRPC projects to Gradle</li> <li><a href="26a0a42d02"><code>26a0a42</code></a> Add additional tests for parameterized injection and parameterized modules.</li> <li><a href="0e73ac51f1"><code>0e73ac5</code></a> Internal changes.</li> <li><a href="3ae4745e59"><code>3ae4745</code></a> Add hilt-android-testing to the Gradle projects</li> <li><a href="092a85af09"><code>092a85a</code></a> Bump <code>androidx.annotation:annotation</code> for Dagger/Hilt androidx deps and remov...</li> <li><a href="57a439ba18"><code>57a439b</code></a> Add hilt-android to the Gradle projects</li> <li><a href="59ac2f981f"><code>59ac2f9</code></a> Add a limit to the number of similar bindings shown to prevent too much error...</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.57...dagger-2.57.1">compare view</a></li> </ul> </details> <br /> Updates `androidx.hilt:hilt-compiler` from 1.2.0 to 1.3.0 Updates `com.google.dagger:hilt-android-compiler` from 2.57 to 2.57.1 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/dagger/releases">com.google.dagger:hilt-android-compiler's releases</a>.</em></p> <blockquote> <h2>Dagger 2.57.1</h2> <h1>Bug fixes</h1> <ul> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4734">#4734</a>: Updated Hilt's Gradle Plugin detection of AGP to maximize compatibility and avoid the confusing 'The Hilt Android Gradle plugin can only be applied to an Android project.' error when the plugin is on an Android project. (20adecbf5)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Set coreLibrariesVersion for the Kotlin compilation of the Hilt Gradle Plugin to further improve backwards compatibility. (00c7fc203)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Use api / language versions for the Kotlin compilation of the Hilt Gradle Plugin to not force projects to update to Kotlin 2.2.0, the current version used by the plugin. (58e499243)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4780">#4780</a>: Add support for the Jakarta Singleton annotation in Hilt. (ec7f76fa3)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4917">#4917</a>: Removes the explicit dependency to androidx.annotation:annotation-jvm and to a beta version of it. (092a85af0)</li> <li>Limit number of similar bindings shown in error messages to 20 (59ac2f981)</li> <li>Update wording for <a href="https://github.com/AssistedInject"><code>@AssistedInject</code></a> error to be more specific. (1702e79e0)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="85586e55c6"><code>85586e5</code></a> 2.57.1 release</li> <li><a href="20adecbf5e"><code>20adecb</code></a> Update Hilt's Gradle Plugin detection of AGP</li> <li><a href="ec7f76fa3f"><code>ec7f76f</code></a> Add the <code>jakarta.inject.Singleton</code> annotation to the Hilt <code>SingletonComponent</code></li> <li><a href="f5c5301bcd"><code>f5c5301</code></a> Add gRPC projects to Gradle</li> <li><a href="26a0a42d02"><code>26a0a42</code></a> Add additional tests for parameterized injection and parameterized modules.</li> <li><a href="0e73ac51f1"><code>0e73ac5</code></a> Internal changes.</li> <li><a href="3ae4745e59"><code>3ae4745</code></a> Add hilt-android-testing to the Gradle projects</li> <li><a href="092a85af09"><code>092a85a</code></a> Bump <code>androidx.annotation:annotation</code> for Dagger/Hilt androidx deps and remov...</li> <li><a href="57a439ba18"><code>57a439b</code></a> Add hilt-android to the Gradle projects</li> <li><a href="59ac2f981f"><code>59ac2f9</code></a> Add a limit to the number of similar bindings shown to prevent too much error...</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.57...dagger-2.57.1">compare view</a></li> </ul> </details> <br /> Updates `com.google.dagger:hilt-android-testing` from 2.57 to 2.57.1 <details> <summary>Release notes</summary> <p><em>Sourced from <a href="https://github.com/google/dagger/releases">com.google.dagger:hilt-android-testing's releases</a>.</em></p> <blockquote> <h2>Dagger 2.57.1</h2> <h1>Bug fixes</h1> <ul> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4734">#4734</a>: Updated Hilt's Gradle Plugin detection of AGP to maximize compatibility and avoid the confusing 'The Hilt Android Gradle plugin can only be applied to an Android project.' error when the plugin is on an Android project. (20adecbf5)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Set coreLibrariesVersion for the Kotlin compilation of the Hilt Gradle Plugin to further improve backwards compatibility. (00c7fc203)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4848">#4848</a>: Use api / language versions for the Kotlin compilation of the Hilt Gradle Plugin to not force projects to update to Kotlin 2.2.0, the current version used by the plugin. (58e499243)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4780">#4780</a>: Add support for the Jakarta Singleton annotation in Hilt. (ec7f76fa3)</li> <li>Fixes <a href="https://redirect.github.com/google/dagger/issues/4917">#4917</a>: Removes the explicit dependency to androidx.annotation:annotation-jvm and to a beta version of it. (092a85af0)</li> <li>Limit number of similar bindings shown in error messages to 20 (59ac2f981)</li> <li>Update wording for <a href="https://github.com/AssistedInject"><code>@AssistedInject</code></a> error to be more specific. (1702e79e0)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="85586e55c6"><code>85586e5</code></a> 2.57.1 release</li> <li><a href="20adecbf5e"><code>20adecb</code></a> Update Hilt's Gradle Plugin detection of AGP</li> <li><a href="ec7f76fa3f"><code>ec7f76f</code></a> Add the <code>jakarta.inject.Singleton</code> annotation to the Hilt <code>SingletonComponent</code></li> <li><a href="f5c5301bcd"><code>f5c5301</code></a> Add gRPC projects to Gradle</li> <li><a href="26a0a42d02"><code>26a0a42</code></a> Add additional tests for parameterized injection and parameterized modules.</li> <li><a href="0e73ac51f1"><code>0e73ac5</code></a> Internal changes.</li> <li><a href="3ae4745e59"><code>3ae4745</code></a> Add hilt-android-testing to the Gradle projects</li> <li><a href="092a85af09"><code>092a85a</code></a> Bump <code>androidx.annotation:annotation</code> for Dagger/Hilt androidx deps and remov...</li> <li><a href="57a439ba18"><code>57a439b</code></a> Add hilt-android to the Gradle projects</li> <li><a href="59ac2f981f"><code>59ac2f9</code></a> Add a limit to the number of similar bindings shown to prevent too much error...</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.57...dagger-2.57.1">compare view</a></li> </ul> </details> <br /> Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) --- <details> <summary>Dependabot commands and options</summary> <br /> You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show <dependency name> ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore <dependency name> major version` will close this group update PR and stop Dependabot creating any more for the specific dependency's major version (unless you unignore this specific dependency's major version or upgrade to it yourself) - `@dependabot ignore <dependency name> minor version` will close this group update PR and stop Dependabot creating any more for the specific dependency's minor version (unless you unignore this specific dependency's minor version or upgrade to it yourself) - `@dependabot ignore <dependency name>` will close this group update PR and stop Dependabot creating any more for the specific dependency (unless you unignore this specific dependency or upgrade to it yourself) - `@dependabot unignore <dependency name>` will remove all of the ignore conditions of the specified dependency - `@dependabot unignore <dependency name> <ignore condition>` will remove the ignore condition of the specified dependency and ignore conditions </details> Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Firezone Android client
This README contains instructions for building and testing the Android client locally.
Dev Setup
-
Install your JDK 17 of choice. We recommend just updating your CLI environment to use the JDK bundled in Android Studio to ensure you're using the same JDK on the CLI as Android Studio.
-
Install the Android SDK through Android Studio.
- Open Android studio, go to Android Studio > Preferences
- Search for
sdk - Find the
Android SDKnav item underSystem Settingsand select - Click the
Editbutton next to theAndroid SDK Locationfield - Follow the steps presented to install Android SDK
-
Install
NDKusing Android StudioTo see which version is installed, make sure to select the
Show Package Detailscheckbox in theAndroid SDKsettings page in Android StudioMake sure the correct NDK version is installed by looking at:
./app/build.gradle.kts -
Set the following properties in your
local.propertiesfile:sdk.dir=/Users/<username>/Library/Android/sdk -
Make sure the following Rust targets are installed into the correct toolchain.
aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-androidEnsure you've activated the correct toolchain version for your local environment with
rustup default <toolchain>(find this from the root/rust/rust-toolchain.tomlfile), then run:rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-android -
Perform a test build:
./gradlew assembleDebug.
If you get errors about rustc or cargo not being found, it can help to
explicitly specify the path to these in your shell environment. For example:
# ~/.zprofile or ~/.bash_profile
export RUST_ANDROID_GRADLE_RUSTC_COMMAND=$HOME/.cargo/bin/rustc
export RUST_ANDROID_GRADLE_CARGO_COMMAND=$HOME/.cargo/bin/cargo
Release Setup
We release from GitHub CI, so this shouldn't be necessary. But if you're looking
to test the release variant locally:
- Download the keystore from 1Pass and save to
app/.signing/keystore.jksdir. - Download firebase credentials from 1Pass and save to
app/.signing/firebase.json - Now you can execute the
*Releasetasks with:
export KEYSTORE_PATH="$(pwd)/app/.signing/keystore.jks"
export FIREBASE_CREDENTIALS_PATH="$(pwd)/app/.signing/firebase.json"
HISTCONTROL=ignorespace # prevents saving the next line in shell history
KEYSTORE_PASSWORD='keystore_password' KEYSTORE_KEY_PASSWORD='keystore_key_password' ./gradlew assembleRelease
Logs
To see all connlib related logs via ADB use:
adb logcat --format color "connlib *:S"
This will show logs of all levels from the connlib tag and silence logs from other tags (*:S).
