diff --git a/docs/dev_environment.md b/docs/dev_environment.md --- a/docs/dev_environment.md +++ b/docs/dev_environment.md @@ -194,10 +194,10 @@ You can run `sdk version` to see if SDKMAN! was installed properly. -Run the following to install Azul Zulu 11 with SDKMAN!: +Run the following to install Azul Zulu 17 with SDKMAN!: ``` -sdk install java 11.0.13-zulu +sdk install java 17.0.16-zulu ``` SDKMAN! takes care of setting up the `$JAVA_HOME` environment variable to point to the newly installed JDK. You can verify this by running `echo $JAVA_HOME`. @@ -209,7 +209,7 @@ You’ll be prompted to select a JDK installation. If your SDKMAN!-sourced JDK doesn’t appear in the dropdown, you can find the absolute path to your installed JDK with the following command: ``` -sdk home java 11.0.13-zulu +sdk home java 17.0.16-zulu ``` Make sure you check the boxes for the following: @@ -229,15 +229,15 @@ ### Android SDK -Android Studio installs the latest Android SDK by default, but since React Native uses the Android 11 SDK specifically, we’ll need to install it using Android Studio’s SDK Manager. You can access the SDK Manager from the “Welcome to Android Studio” screen that pops up when you first open the application, from More Actions → SDK Manager. If you already have a project open, you can access it from Tools → SDK Manager. +Android Studio installs the latest Android SDK by default, but since React Native uses the Android 15 SDK specifically, we’ll need to install it using Android Studio’s SDK Manager. You can access the SDK Manager from the “Welcome to Android Studio” screen that pops up when you first open the application, from More Actions → SDK Manager. If you already have a project open, you can access it from Tools → SDK Manager. -Once you have the SDK Manager open, select the “SDK Platforms” tab, and then check the box for “Show Package Details”. Now expand the “Android 11 (R)” section, and make sure the following subsections are checked: +Once you have the SDK Manager open, select the “SDK Platforms” tab, and then check the box for “Show Package Details”. Now expand the “Android 15.0” section, and make sure the following subsections are checked: -- `Android SDK Platform 30` +- `Android SDK Platform 35` #### Intel x86-64: -- `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` +- `Google Play Intel x86_64 Atom System Image` #### Apple silicon: @@ -247,7 +247,7 @@ - Android SDK Build-Tools - NDK -- CMake version 3.18.1 +- CMake To finish the SDK Manager step, click “Apply” to download and install everything you’ve selected. @@ -668,7 +668,6 @@ You’ll need to delete and reinstall the app for changes to developer’s machine hostname to take effect, as the default keyserver URL is persisted in Redux. - If you’re deploying a release build, the above strategy won’t work. Your best bet to override the server URL is to get to the secret “Developer tools” menu option in the app. - 1. You may need to use a real production account for this, since the server address will default to the production server if this is the first build you’ve deployed to the target device. 2. Next, in order for the “Developer tools” menu option to appear, you’ll need to add your user ID to [the list of user IDs in `staff.js`](https://github.com/CommE2E/comm/blob/master/lib/facts/staff.js). A good way to figure out your user ID is to use the Chrome Redux debugger to inspect the `currentUserInfo` property when logged into the web app. 3. Finally, you should be able to navigate to Profile → Developer tools in the app and set the address of the local server. It should look something like this: diff --git a/docs/nix_mobile_setup.md b/docs/nix_mobile_setup.md --- a/docs/nix_mobile_setup.md +++ b/docs/nix_mobile_setup.md @@ -30,7 +30,7 @@ ### JDK -We’ll need the Java Development Kit (JDK) for Android development. While the Nix development environment provides JDK 11 when you run `nix develop`, development with Android Studio occurs outside of the Nix environment, and as such will require a standalone install. +We’ll need the Java Development Kit (JDK) for Android development. While the Nix development environment provides JDK 17 when you run `nix develop`, development with Android Studio occurs outside of the Nix environment, and as such will require a standalone install. We’re using [SDKMAN!](https://sdkman.io/) to manage our JDK installation. Run the following to install SDKMAN!: @@ -46,10 +46,10 @@ You can run `sdk version` to see if SDKMAN! was installed properly. -Run the following to install Azul Zulu 11 with SDKMAN!: +Run the following to install Azul Zulu 17 with SDKMAN!: ``` -sdk install java 11.0.13-zulu +sdk install java 17.0.16-zulu ``` SDKMAN! takes care of setting up the `$JAVA_HOME` environment variable to point to the newly installed JDK. You can verify this by running `echo $JAVA_HOME`. @@ -61,7 +61,7 @@ You’ll be prompted to select a JDK installation. If your SDKMAN!-sourced JDK doesn’t appear in the dropdown, you can find the absolute path to your installed JDK with the following command: ``` -sdk home java 11.0.13-zulu +sdk home java 17.0.16-zulu ``` Make sure you check the boxes for the following: @@ -81,15 +81,15 @@ ### Android SDK -Android Studio installs the latest Android SDK by default, but since React Native uses the Android 11 SDK specifically, we’ll need to install it using Android Studio’s SDK Manager. You can access the SDK Manager from the “Welcome to Android Studio” screen that pops up when you first open the application, from More Actions → SDK Manager. If you already have a project open, you can access it from Tools → SDK Manager. +Android Studio installs the latest Android SDK by default, but since React Native uses the Android 15 SDK specifically, we’ll need to install it using Android Studio’s SDK Manager. You can access the SDK Manager from the “Welcome to Android Studio” screen that pops up when you first open the application, from More Actions → SDK Manager. If you already have a project open, you can access it from Tools → SDK Manager. -Once you have the SDK Manager open, select the “SDK Platforms” tab, and then check the box for “Show Package Details”. Now expand the “Android 11 (R)” section, and make sure the following subsections are checked: +Once you have the SDK Manager open, select the “SDK Platforms” tab, and then check the box for “Show Package Details”. Now expand the “Android 15.0” section, and make sure the following subsections are checked: -- `Android SDK Platform 30` +- `Android SDK Platform 35` #### Intel x86-64: -- `Intel x86 Atom_64 System Image` or `Google APIs Intel x86 Atom System Image` +- `Google Play Intel x86_64 Atom System Image` #### Apple silicon: @@ -99,7 +99,7 @@ - Android SDK Build-Tools - NDK -- CMake version 3.18.1 +- CMake To finish the SDK Manager step, click “Apply” to download and install everything you’ve selected. diff --git a/nix/dev-shell.nix b/nix/dev-shell.nix --- a/nix/dev-shell.nix +++ b/nix/dev-shell.nix @@ -29,7 +29,7 @@ , mariadb-up , nodejs , olm -, openjdk11 +, openjdk17 , openssl , pkg-config , protobuf3_21 @@ -64,7 +64,7 @@ emscripten # android - openjdk11 + openjdk17 # node development mariadb @@ -117,7 +117,7 @@ libiconv # identity service ]; - JAVA_HOME = openjdk11.passthru.home; + JAVA_HOME = openjdk17.passthru.home; # shell commands to be ran upon entering shell shellHook = ''