Bumps the hilt group in /kotlin/android with 4 updates: [com.google.dagger.hilt.android](https://github.com/google/dagger), [com.google.dagger:hilt-android](https://github.com/google/dagger), [com.google.dagger:hilt-android-compiler](https://github.com/google/dagger) and [com.google.dagger:hilt-android-testing](https://github.com/google/dagger). Updates `com.google.dagger.hilt.android` from 2.54 to 2.55 <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.55</h2> <h1>Notable/breaking changes</h1> <ul> <li>Added support for injecting <code>jakarta.inject.Provider</code>. This should be usable anywhere <code>javax.inject.Provider</code> is usable. Note that this technically comes with a breaking change to disallow providing <code>jakarta.inject.Provider</code> types in the same way it is disallowed for <code>javax.inject.Provider</code>. (caa7e178b)</li> <li>Fixed a number of binding graph related issues. These fixes can be enabled with, <code>-Adagger.useBindingGraphFix=ENABLED</code>, but due to this sometimes being a breaking change we’ve set the default behavior to “disabled” for now. We will flip the default to “enabled” in a future release, and eventually remove the flag altogether. Enabling this feature can fix a number of confusing error messages. See <a href="https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix">https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix</a> for more details.</li> </ul> <h1>Bug fixes</h1> <ul> <li>Fixed <a href="https://redirect.github.com/google/dagger/issues/4549">#4549</a>: Fixed incremental processing for LazyClassKey proguard files by adding the originating element to the <code>writeResource</code> call. (98a027541)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="14ad560f70"><code>14ad560</code></a> 2.55 release</li> <li><a href="7ca9977009"><code>7ca9977</code></a> Add binary compatibility validator to the Gradle projects</li> <li><a href="4cd83cb8a6"><code>4cd83cb</code></a> Add documentation for <code>dagger.useBindingGraphFix</code> compiler option.</li> <li><a href="8b4f9b6421"><code>8b4f9b6</code></a> Add maven publish plugin to Gradle projects.</li> <li><a href="9daa0ae7b1"><code>9daa0ae</code></a> Wire resource configuration while keeping the Bazel project structure.</li> <li><a href="3418609a2b"><code>3418609</code></a> Move JDK toolchain, Kotlin language and JVM target configuration to conventio...</li> <li><a href="0927b9a514"><code>0927b9a</code></a> Add flag to control LegacyBindingGraphFactory usage.</li> <li><a href="1620e92d6d"><code>1620e92</code></a> Add Github CI step and action for building with Gradle</li> <li><a href="c43783a4b7"><code>c43783a</code></a> Initial setup of Gradle as a build system for Dagger</li> <li><a href="98a0275416"><code>98a0275</code></a> Fix LazyClassKey proguard file issues.</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.54...dagger-2.55">compare view</a></li> </ul> </details> <br /> Updates `com.google.dagger:hilt-android` from 2.54 to 2.55 <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.55</h2> <h1>Notable/breaking changes</h1> <ul> <li>Added support for injecting <code>jakarta.inject.Provider</code>. This should be usable anywhere <code>javax.inject.Provider</code> is usable. Note that this technically comes with a breaking change to disallow providing <code>jakarta.inject.Provider</code> types in the same way it is disallowed for <code>javax.inject.Provider</code>. (caa7e178b)</li> <li>Fixed a number of binding graph related issues. These fixes can be enabled with, <code>-Adagger.useBindingGraphFix=ENABLED</code>, but due to this sometimes being a breaking change we’ve set the default behavior to “disabled” for now. We will flip the default to “enabled” in a future release, and eventually remove the flag altogether. Enabling this feature can fix a number of confusing error messages. See <a href="https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix">https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix</a> for more details.</li> </ul> <h1>Bug fixes</h1> <ul> <li>Fixed <a href="https://redirect.github.com/google/dagger/issues/4549">#4549</a>: Fixed incremental processing for LazyClassKey proguard files by adding the originating element to the <code>writeResource</code> call. (98a027541)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="14ad560f70"><code>14ad560</code></a> 2.55 release</li> <li><a href="7ca9977009"><code>7ca9977</code></a> Add binary compatibility validator to the Gradle projects</li> <li><a href="4cd83cb8a6"><code>4cd83cb</code></a> Add documentation for <code>dagger.useBindingGraphFix</code> compiler option.</li> <li><a href="8b4f9b6421"><code>8b4f9b6</code></a> Add maven publish plugin to Gradle projects.</li> <li><a href="9daa0ae7b1"><code>9daa0ae</code></a> Wire resource configuration while keeping the Bazel project structure.</li> <li><a href="3418609a2b"><code>3418609</code></a> Move JDK toolchain, Kotlin language and JVM target configuration to conventio...</li> <li><a href="0927b9a514"><code>0927b9a</code></a> Add flag to control LegacyBindingGraphFactory usage.</li> <li><a href="1620e92d6d"><code>1620e92</code></a> Add Github CI step and action for building with Gradle</li> <li><a href="c43783a4b7"><code>c43783a</code></a> Initial setup of Gradle as a build system for Dagger</li> <li><a href="98a0275416"><code>98a0275</code></a> Fix LazyClassKey proguard file issues.</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.54...dagger-2.55">compare view</a></li> </ul> </details> <br /> Updates `com.google.dagger:hilt-android-compiler` from 2.54 to 2.55 <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.55</h2> <h1>Notable/breaking changes</h1> <ul> <li>Added support for injecting <code>jakarta.inject.Provider</code>. This should be usable anywhere <code>javax.inject.Provider</code> is usable. Note that this technically comes with a breaking change to disallow providing <code>jakarta.inject.Provider</code> types in the same way it is disallowed for <code>javax.inject.Provider</code>. (caa7e178b)</li> <li>Fixed a number of binding graph related issues. These fixes can be enabled with, <code>-Adagger.useBindingGraphFix=ENABLED</code>, but due to this sometimes being a breaking change we’ve set the default behavior to “disabled” for now. We will flip the default to “enabled” in a future release, and eventually remove the flag altogether. Enabling this feature can fix a number of confusing error messages. See <a href="https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix">https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix</a> for more details.</li> </ul> <h1>Bug fixes</h1> <ul> <li>Fixed <a href="https://redirect.github.com/google/dagger/issues/4549">#4549</a>: Fixed incremental processing for LazyClassKey proguard files by adding the originating element to the <code>writeResource</code> call. (98a027541)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="14ad560f70"><code>14ad560</code></a> 2.55 release</li> <li><a href="7ca9977009"><code>7ca9977</code></a> Add binary compatibility validator to the Gradle projects</li> <li><a href="4cd83cb8a6"><code>4cd83cb</code></a> Add documentation for <code>dagger.useBindingGraphFix</code> compiler option.</li> <li><a href="8b4f9b6421"><code>8b4f9b6</code></a> Add maven publish plugin to Gradle projects.</li> <li><a href="9daa0ae7b1"><code>9daa0ae</code></a> Wire resource configuration while keeping the Bazel project structure.</li> <li><a href="3418609a2b"><code>3418609</code></a> Move JDK toolchain, Kotlin language and JVM target configuration to conventio...</li> <li><a href="0927b9a514"><code>0927b9a</code></a> Add flag to control LegacyBindingGraphFactory usage.</li> <li><a href="1620e92d6d"><code>1620e92</code></a> Add Github CI step and action for building with Gradle</li> <li><a href="c43783a4b7"><code>c43783a</code></a> Initial setup of Gradle as a build system for Dagger</li> <li><a href="98a0275416"><code>98a0275</code></a> Fix LazyClassKey proguard file issues.</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.54...dagger-2.55">compare view</a></li> </ul> </details> <br /> Updates `com.google.dagger:hilt-android-testing` from 2.54 to 2.55 <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.55</h2> <h1>Notable/breaking changes</h1> <ul> <li>Added support for injecting <code>jakarta.inject.Provider</code>. This should be usable anywhere <code>javax.inject.Provider</code> is usable. Note that this technically comes with a breaking change to disallow providing <code>jakarta.inject.Provider</code> types in the same way it is disallowed for <code>javax.inject.Provider</code>. (caa7e178b)</li> <li>Fixed a number of binding graph related issues. These fixes can be enabled with, <code>-Adagger.useBindingGraphFix=ENABLED</code>, but due to this sometimes being a breaking change we’ve set the default behavior to “disabled” for now. We will flip the default to “enabled” in a future release, and eventually remove the flag altogether. Enabling this feature can fix a number of confusing error messages. See <a href="https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix">https://dagger.dev/dev-guide/compiler-options#useBindingGraphFix</a> for more details.</li> </ul> <h1>Bug fixes</h1> <ul> <li>Fixed <a href="https://redirect.github.com/google/dagger/issues/4549">#4549</a>: Fixed incremental processing for LazyClassKey proguard files by adding the originating element to the <code>writeResource</code> call. (98a027541)</li> </ul> </blockquote> </details> <details> <summary>Commits</summary> <ul> <li><a href="14ad560f70"><code>14ad560</code></a> 2.55 release</li> <li><a href="7ca9977009"><code>7ca9977</code></a> Add binary compatibility validator to the Gradle projects</li> <li><a href="4cd83cb8a6"><code>4cd83cb</code></a> Add documentation for <code>dagger.useBindingGraphFix</code> compiler option.</li> <li><a href="8b4f9b6421"><code>8b4f9b6</code></a> Add maven publish plugin to Gradle projects.</li> <li><a href="9daa0ae7b1"><code>9daa0ae</code></a> Wire resource configuration while keeping the Bazel project structure.</li> <li><a href="3418609a2b"><code>3418609</code></a> Move JDK toolchain, Kotlin language and JVM target configuration to conventio...</li> <li><a href="0927b9a514"><code>0927b9a</code></a> Add flag to control LegacyBindingGraphFactory usage.</li> <li><a href="1620e92d6d"><code>1620e92</code></a> Add Github CI step and action for building with Gradle</li> <li><a href="c43783a4b7"><code>c43783a</code></a> Initial setup of Gradle as a build system for Dagger</li> <li><a href="98a0275416"><code>98a0275</code></a> Fix LazyClassKey proguard file issues.</li> <li>Additional commits viewable in <a href="https://github.com/google/dagger/compare/dagger-2.54...dagger-2.55">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:
../../rust/connlib/clients/android/connlib/build.gradle.kts -
Set the following ENV variables in the start up config for your shell:
JAVA_HOME=/Applications/Android\ Studio.app/Contents/jbr/Contents/Home ANDROID_HOME=/Users/<username>/Library/Android/sdk NDK_HOME=$ANDROID_HOME/ndk-bundle PATH=$PATH:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin -
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
