github-personal/firezone
1
0
Fork 0
mirror of https://github.com/outbackdingo/firezone.git synced 2026-01-27 10:18:54 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
af8c24614a6137f77f5d2e6b834c8e4ff7a57839
firezone/kotlin/android
History
dependabot[bot] af8c24614a build(deps): bump com.google.code.gson:gson from 2.11.0 to 2.12.1 in /kotlin/android (#7979) 
Bumps [com.google.code.gson:gson](https://github.com/google/gson) from
2.11.0 to 2.12.1.
<details>
<summary>Release notes</summary>
<p><em>Sourced from <a
href="https://github.com/google/gson/releases">com.google.code.gson:gson's
releases</a>.</em></p>
<blockquote>
<h2>Gson 2.11.1</h2>
<p>The only difference between this release and 2.11.0 is that OSGi
declarations in the Gson jar now specify that
<code>com.google.errorprone.annotations</code> is an optional
dependency, not a required one. If you do not use OSGi then there is no
effective change.</p>
<h2>Gson 2.12.0</h2>
<h2>What's Changed</h2>
<p>The biggest change is that we no longer support Java 7. People who
still need to run on Java 7 will need to use an earlier version of
Gson.</p>
<p>Other changes:</p>
<ul>
<li>Allow registering adapters for <code>JsonElement</code> again by <a
href="https://github.com/Marcono1234"><code>@​Marcono1234</code></a> in
<a
href="https://redirect.github.com/google/gson/pull/2789">google/gson#2789</a></li>
<li>Add nesting limit for <code>JsonReader</code> by <a
href="https://github.com/Marcono1234"><code>@​Marcono1234</code></a> in
<a
href="https://redirect.github.com/google/gson/pull/2588">google/gson#2588</a></li>
<li>Add <code>@CheckReturnValue</code> to our packages. by <a
href="https://github.com/cpovirk"><code>@​cpovirk</code></a> in <a
href="https://redirect.github.com/google/gson/pull/2693">google/gson#2693</a></li>
<li>Add NullSafeTypeAdapter to prevent TypeAdapter.nullSafe() from
returning nested null-safe type adapters (<a
href="https://redirect.github.com/google/gson/issues/2729">#2729</a>) by
<a
href="https://github.com/lyubomyr-shaydariv"><code>@​lyubomyr-shaydariv</code></a>
in <a
href="https://redirect.github.com/google/gson/pull/2731">google/gson#2731</a></li>
<li>Support Properties subclasses in GsonTypes.getMapKeyAndValueTypes by
<a href="https://github.com/panic08"><code>@​panic08</code></a> in <a
href="https://redirect.github.com/google/gson/pull/2758">google/gson#2758</a></li>
<li>Enforce rawType to be a Class in ParameterizedTypeImpl by <a
href="https://github.com/panic08"><code>@​panic08</code></a> in <a
href="https://redirect.github.com/google/gson/pull/2759">google/gson#2759</a></li>
<li>Remove <code>AccessController</code> usage for enum adapter by <a
href="https://github.com/Marcono1234"><code>@​Marcono1234</code></a> in
<a
href="https://redirect.github.com/google/gson/pull/2704">google/gson#2704</a></li>
<li>Fix typeArguments array not being cloned when resolving
ParameterizedType with changed owner by <a
href="https://github.com/TBlueF"><code>@​TBlueF</code></a> in <a
href="https://redirect.github.com/google/gson/pull/2706">google/gson#2706</a></li>
<li>Remove duplicated declaration of required OSGi execution environment
by <a href="https://github.com/HannesWell"><code>@​HannesWell</code></a>
in <a
href="https://redirect.github.com/google/gson/pull/2711">google/gson#2711</a></li>
<li>Move bnd.bnd file configuration into 'bnd' element of
bnd-maven-plugin by <a
href="https://github.com/HannesWell"><code>@​HannesWell</code></a> in <a
href="https://redirect.github.com/google/gson/pull/2712">google/gson#2712</a></li>
<li>Move enum and <code>JsonElement</code> adapter classes to separate
class files by <a
href="https://github.com/Marcono1234"><code>@​Marcono1234</code></a> in
<a
href="https://redirect.github.com/google/gson/pull/2727">google/gson#2727</a></li>
<li>EnumTypeAdapter constructor optimization by <a
href="https://github.com/esaulpaugh"><code>@​esaulpaugh</code></a> in <a
href="https://redirect.github.com/google/gson/pull/2734">google/gson#2734</a></li>
<li>OSGi / bnd: Remove the self-Import of gson.annotations by <a
href="https://github.com/chrisrueger"><code>@​chrisrueger</code></a> in
<a
href="https://redirect.github.com/google/gson/pull/2735">google/gson#2735</a></li>
</ul>
<h2>New Contributors</h2>
<ul>
<li><a href="https://github.com/cpovirk"><code>@​cpovirk</code></a> made
their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2693">google/gson#2693</a></li>
<li><a href="https://github.com/jabagawee"><code>@​jabagawee</code></a>
made their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2701">google/gson#2701</a></li>
<li><a href="https://github.com/TBlueF"><code>@​TBlueF</code></a> made
their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2706">google/gson#2706</a></li>
<li><a
href="https://github.com/HannesWell"><code>@​HannesWell</code></a> made
their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2711">google/gson#2711</a></li>
<li><a
href="https://github.com/esaulpaugh"><code>@​esaulpaugh</code></a> made
their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2734">google/gson#2734</a></li>
<li><a
href="https://github.com/chrisrueger"><code>@​chrisrueger</code></a>
made their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2735">google/gson#2735</a></li>
<li><a href="https://github.com/panic08"><code>@​panic08</code></a> made
their first contribution in <a
href="https://redirect.github.com/google/gson/pull/2756">google/gson#2756</a></li>
</ul>
<p><strong>Full Changelog</strong>: <a
href="https://github.com/google/gson/compare/gson-parent-2.11.0...gson-parent-2.12.0">https://github.com/google/gson/compare/gson-parent-2.11.0...gson-parent-2.12.0</a></p>
</blockquote>
</details>
<details>
<summary>Commits</summary>
<ul>
<li><a
href="29e3d1d2cc"><code>29e3d1d</code></a>
[maven-release-plugin] prepare release gson-parent-2.12.1</li>
<li><a
href="be456cf0f7"><code>be456cf</code></a>
Make the import of com.google.errorprone optional (<a
href="https://redirect.github.com/google/gson/issues/2795">#2795</a>)</li>
<li><a
href="b2e26fa97b"><code>b2e26fa</code></a>
Bump the github-actions group with 3 updates (<a
href="https://redirect.github.com/google/gson/issues/2785">#2785</a>)</li>
<li><a
href="10bdd6dc6a"><code>10bdd6d</code></a>
Simplify collection type adapters slightly. (<a
href="https://redirect.github.com/google/gson/issues/2791">#2791</a>)</li>
<li><a
href="ab9c54f40b"><code>ab9c54f</code></a>
[maven-release-plugin] prepare for next development iteration</li>
<li><a
href="aaf7a12d80"><code>aaf7a12</code></a>
[maven-release-plugin] prepare release gson-parent-2.12.0</li>
<li><a
href="a2b1c3c882"><code>a2b1c3c</code></a>
Allow registering adapters for <code>JsonElement</code> again (<a
href="https://redirect.github.com/google/gson/issues/2789">#2789</a>)</li>
<li><a
href="e5dce841f7"><code>e5dce84</code></a>
Bump the maven group with 8 updates (<a
href="https://redirect.github.com/google/gson/issues/2784">#2784</a>)</li>
<li><a
href="84e5f16aca"><code>84e5f16</code></a>
Bump the maven group with 7 updates (<a
href="https://redirect.github.com/google/gson/issues/2777">#2777</a>)</li>
<li><a
href="9f3e577d82"><code>9f3e577</code></a>
Bump the github-actions group with 2 updates (<a
href="https://redirect.github.com/google/gson/issues/2778">#2778</a>)</li>
<li>Additional commits viewable in <a
href="https://github.com/google/gson/compare/gson-parent-2.11.0...gson-parent-2.12.1">compare
view</a></li>
</ul>
</details>
<br />


[![Dependabot compatibility
score](https://dependabot-badges.githubapp.com/badges/compatibility_score?dependency-name=com.google.code.gson:gson&package-manager=gradle&previous-version=2.11.0&new-version=2.12.1)](https://docs.github.com/en/github/managing-security-vulnerabilities/about-dependabot-security-updates#about-compatibility-scores)

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 this major version` will close this PR and stop
Dependabot creating any more for this major version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this minor version` will close this PR and stop
Dependabot creating any more for this minor version (unless you reopen
the PR or upgrade to it yourself)
- `@dependabot ignore this dependency` will close this PR and stop
Dependabot creating any more for this dependency (unless you reopen the
PR or upgrade to it yourself)


</details>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-02-01 17:01:23 +00:00
..
app
build(deps): bump com.google.code.gson:gson from 2.11.0 to 2.12.1 in /kotlin/android (#7979)
2025-02-01 17:01:23 +00:00
gradle/wrapper
chore(android): Bump gradle to 8.10.2 to be compatible with latest Android app package (#6994)
2024-10-09 23:36:42 +00:00
images
Update Android README dev instructions (#2814)
2023-12-07 13:45:21 +00:00
.gitignore
fix(android): Allow bypassing AlwaysOn VPN (#3522)
2024-02-02 06:27:05 +00:00
build.gradle.kts
chore(android): Bump kotlin-android and firebase-bom (#7950)
2025-01-29 21:45:12 +00:00
gradle.properties
Github Actions cache on main and scope caches for all languages/runtimes (#2233)
2023-10-04 17:29:04 -07:00
gradlew
chore(android): Bump gradle to 8.10.2 to be compatible with latest Android app package (#6994)
2024-10-09 23:36:42 +00:00
gradlew.bat
chore(android): Bump gradle to 8.10.2 to be compatible with latest Android app package (#6994)
2024-10-09 23:36:42 +00:00
LICENSE
chore: Update copyright date (#4044)
2024-03-08 01:55:27 +00:00
README.md
build(deps): Bump cargo gradle plugin to fix pipes issue (#7598)
2024-12-30 07:22:54 +00:00
settings.gradle.kts
fix(android): Simplify connlib gradle build configuration to ensure libconnlib.so is packaged (#3207)
2024-01-12 08:16:43 -08:00

README.md

Firezone Android client

This README contains instructions for building and testing the Android client locally.

Dev Setup

  1. Install Rust

  2. Install Android Studio

  3. 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.

  4. Install the Android SDK through Android Studio.

    • Open Android studio, go to Android Studio > Preferences
    • Search for sdk
    • Find the Android SDK nav item under System Settings and select
    • Click the Edit button next to the Android SDK Location field
    • Follow the steps presented to install Android SDK

  5. Install NDK using Android Studio

    To see which version is installed, make sure to select the Show Package Details checkbox in the Android SDK settings page in Android Studio

    Android SDK Tools

    Make sure the correct NDK version is installed by looking at: ../../rust/connlib/clients/android/connlib/build.gradle.kts

  6. 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

  7. 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-android

    Ensure you've activated the correct toolchain version for your local environment with rustup default <toolchain> (find this from the root /rust/rust-toolchain.toml file), then run:

    rustup target add aarch64-linux-android arm-linux-androideabi armv7-linux-androideabi i686-linux-android x86_64-linux-android

  8. 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:

  1. Download the keystore from 1Pass and save to app/.signing/keystore.jks dir.
  2. Download firebase credentials from 1Pass and save to app/.signing/firebase.json
  3. Now you can execute the *Release tasks 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
Reference in New Issue View Git Blame Copy Permalink