fix: lint

Notable upgrades:

* Bash `5.1` to `5.2`
* Git `2.37.3` to `2.40.1`
* Curl `7.85.0` to `8.0.1`
* OpenSSL `3.0.5` to `3.0.8`
* Go `1.18.6` to `1.18.9`
* NodeJS `18.9.1` to `18.16.0`
* Java `1.8.0_322` to `11.0.18`
* Ruby `3.1.2` to `3.1.4`
* Python `2.7.18` to `3.10.11`
* Clojure `1.11.1.1165` to `1.11.1.1273`
* Clj-kondo `v2022.10.05` to `v2023.04.14`
* Zprint `1.2.5` to `1.2.6`
* Bundler `2.3.22` to `2.4.13`
* Gradle `6.9.2` to `6.9.4`
* Android Platform Tools `33.0.2` to `33.0.3`

Removals:

* Zprint since the version in `nixpkgs` was newer than in overlay.
* Xcode wrapper definition was removed since my fixes were merged:
  - https://github.com/NixOS/nixpkgs/pull/204278
  - https://github.com/NixOS/nixpkgs/pull/228696

Signed-off-by: Jakub Sokołowski <jakub@status.im>

VERSION

@@ -1 +1 @@
-1.22.0
+1.23.0

ci/Jenkinsfile.android

@@ -40,9 +40,6 @@ pipeline {
     BUILD_ENV = 'prod'
     NIX_CONF_DIR = "${env.WORKSPACE}/nix"
     FASTLANE_DISABLE_COLORS = 1
-    /* coverage report identification */
-    COVERALLS_SERVICE_NAME = "jenkins"
-    COVERALLS_SERVICE_JOB_ID = "${JOB_NAME}#${BUILD_NUMBER}"
   }
 
   stages {

ci/tools/Jenkinsfile.nix-cache

@@ -61,10 +61,9 @@ pipeline {
     }
     stage('Build android jsbundle') {
       steps { script {
-        /* build/fetch things required to produce a js-bundle for android
-         * (e.g. maven and node repos) */
+        /* Build/fetch deps required for jsbundle build. */
         nix.build(
-          attr: 'targets.mobile.android.jsbundle',
+          attr: 'targets.mobile.jsbundle',
           sandbox: false,
           pure: false,
           link: false
@@ -73,7 +72,7 @@ pipeline {
     }
     stage('Build android deps') {
       steps { script {
-        /* build/fetch things required to build jsbundle and android */
+        /* Build/fetch deps required to build android release. */
         nix.build(
           attr: 'targets.mobile.android.release.buildInputs',
           sandbox: false,
@@ -84,7 +83,7 @@ pipeline {
     }
     stage('Build nix shell deps') {
       steps { script {
-        /* build/fetch things required to instantiate shell.nix for TARGET=all */
+        /* Build/fetch deps required to start default Nix shell. */
         nix.build(
           attr: 'shells.default.buildInputs',
           sandbox: false,

fastlane/Fastfile

@@ -245,15 +245,6 @@ platform :ios do
     )
   end
 
-  desc '`fastlane ios clean` - remove inactive TestFlight users'
-  lane :clean do
-    clean_testflight_testers(
-      username: ENV['FASTLANE_APPLE_ID'],
-      days_of_inactivity: 30
-    )
-    # In the future we can try using 'oldest_build_allowed'
-  end
-
   desc '`fastlane ios saucelabs` - upload .app to sauce labs'
   desc 'also notifies in a GitHub comments'
   desc 'expects to have an .apk prepared: `result/app.apk`'

fastlane/Gemfile

@@ -1,7 +1,3 @@
 source 'https://rubygems.org'
 
 gem 'fastlane', '>= 2.131.0'
-
-plugins_path = ENV['FASTLANE_PLUGINFILE_PATH'] ||
-               File.join(__dir__, 'Pluginfile')
-eval_gemfile(plugins_path) if plugins_path

fastlane/Gemfile.lock

@@ -8,7 +8,7 @@ GEM
     artifactory (3.0.15)
     atomos (0.1.3)
     aws-eventstream (1.2.0)
-    aws-partitions (1.766.0)
+    aws-partitions (1.768.0)
     aws-sdk-core (3.173.0)
       aws-eventstream (~> 1, >= 1.0.2)
       aws-partitions (~> 1, >= 1.651.0)
@@ -65,7 +65,7 @@ GEM
     faraday-retry (1.0.3)
     faraday_middleware (1.2.0)
       faraday (~> 1.0)
-    fastimage (2.2.6)
+    fastimage (2.2.7)
     fastlane (2.212.2)
       CFPropertyList (>= 2.3, < 4.0.0)
       addressable (>= 2.8, < 3.0.0)
@@ -105,7 +105,6 @@ GEM
       xcodeproj (>= 1.13.0, < 2.0.0)
       xcpretty (~> 0.3.0)
       xcpretty-travis-formatter (>= 0.0.3)
-    fastlane-plugin-clean_testflight_testers (0.3.0)
     gh_inspector (1.1.3)
     google-apis-androidpublisher_v3 (0.42.0)
       google-apis-core (>= 0.11.0, < 2.a)
@@ -214,7 +213,6 @@ PLATFORMS
 
 DEPENDENCIES
   fastlane (>= 2.131.0)
-  fastlane-plugin-clean_testflight_testers
 
 BUNDLED WITH
    2.3.9

fastlane/Pluginfile

@@ -1,5 +0,0 @@
-# Autogenerated by fastlane
-#
-# Ensure this file is checked in to source control!
-
-gem 'fastlane-plugin-clean_testflight_testers'

fastlane/default.nix

@@ -24,8 +24,6 @@ let
 
     shellHook = ''
       [ -z "$STATUS_MOBILE_HOME" ] && echo "STATUS_MOBILE_HOME is empty!" && exit 1
-
-      export FASTLANE_PLUGINFILE_PATH=$STATUS_MOBILE_HOME/fastlane/Pluginfile
     '';
 
     meta = with lib; {

fastlane/gemset.nix

@@ -45,10 +45,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0x7v4v8hj0pbzw3x1iv07x8v93fcs74svlhzv7vl6laxm4mc6858";
+      sha256 = "1256rf6zjh3canwr636w7yczbvhh72cpz2fw5ixljbh4fcfkrvlm";
       type = "gem";
     };
-    version = "1.766.0";
+    version = "1.768.0";
   };
   aws-sdk-core = {
     dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"];
@@ -357,10 +357,10 @@
     platforms = [];
     source = {
       remotes = ["https://rubygems.org"];
-      sha256 = "0nnggg20za5vamdpkgrxxa32z33d8hf0g2bciswkhqnc6amb3yjr";
+      sha256 = "1pd7pamzhdz2w0fbcvsfn2nyslznvphnwj16zw35g2b28zd2xyzx";
       type = "gem";
     };
-    version = "2.2.6";
+    version = "2.2.7";
   };
   fastlane = {
     dependencies = ["CFPropertyList" "addressable" "artifactory" "aws-sdk-s3" "babosa" "colored" "commander" "dotenv" "emoji_regex" "excon" "faraday" "faraday-cookie_jar" "faraday_middleware" "fastimage" "gh_inspector" "google-apis-androidpublisher_v3" "google-apis-playcustomapp_v1" "google-cloud-storage" "highline" "json" "jwt" "mini_magick" "multipart-post" "naturally" "optparse" "plist" "rubyzip" "security" "simctl" "terminal-notifier" "terminal-table" "tty-screen" "tty-spinner" "word_wrap" "xcodeproj" "xcpretty" "xcpretty-travis-formatter"];
@@ -373,16 +373,6 @@
     };
     version = "2.212.2";
   };
-  fastlane-plugin-clean_testflight_testers = {
-    groups = ["default"];
-    platforms = [];
-    source = {
-      remotes = ["https://rubygems.org"];
-      sha256 = "0qkcjf7xrnki4v94mcgcm3v2f89vq8clwxx1d5ipv0wwm5ri26c9";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
   gh_inspector = {
     groups = ["default"];
     platforms = [];

modules/react-native-status/android/src/main/java/im/status/ethereum/pushnotifications/PushNotificationHelper.java

@@ -67,8 +67,8 @@ public class PushNotificationHelper {
     private static final long DEFAULT_VIBRATION = 300L;
     private static final String CHANNEL_ID = "status-im-notifications";
     public static final String ACTION_DELETE_NOTIFICATION = "im.status.ethereum.module.DELETE_NOTIFICATION";
-    public static final String ACTION_TAP_NOTIFICATION = "im.status.ethereum.module.TAP_NOTIFICATION";
     public static final String ACTION_TAP_STOP = "im.status.ethereum.module.TAP_STOP";
+    final int flag =  Build.VERSION.SDK_INT >= Build.VERSION_CODES.M ? PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE : PendingIntent.FLAG_CANCEL_CURRENT;
 
     private NotificationManager notificationManager;
 
@@ -119,13 +119,8 @@ public class PushNotificationHelper {
     private final BroadcastReceiver notificationActionReceiver = new BroadcastReceiver() {
             @Override
             public void onReceive(Context context, Intent intent) {
-                if (intent.getAction() == ACTION_TAP_NOTIFICATION ||
-                    intent.getAction() == ACTION_DELETE_NOTIFICATION) {
-                    String deepLink = intent.getExtras().getString("im.status.ethereum.deepLink");
+                if (intent.getAction() == ACTION_DELETE_NOTIFICATION) {
                     String groupId = intent.getExtras().getString("im.status.ethereum.groupId");
-                    if (intent.getAction() == ACTION_TAP_NOTIFICATION) {
-                        context.startActivity(getOpenAppIntent(deepLink));
-                    }
                     if (groupId != null) {
                         cleanGroup(groupId);
                     }
@@ -141,7 +136,6 @@ public class PushNotificationHelper {
     private void registerBroadcastReceiver() {
         IntentFilter filter = new IntentFilter();
         filter.addAction(ACTION_DELETE_NOTIFICATION);
-        filter.addAction(ACTION_TAP_NOTIFICATION);
         filter.addAction(ACTION_TAP_STOP);
         context.registerReceiver(notificationActionReceiver, filter);
         Log.e(LOG_TAG, "Broadcast Receiver registered");
@@ -701,37 +695,31 @@ public class PushNotificationHelper {
 
     private StatusMessage createMessage(Bundle data) {
         Person author = getPerson(data.getBundle("notificationAuthor"));
-        return new StatusMessage(data.getString("id"), author,  data.getLong("timestamp"), data.getString("message"));
+        long timeStampLongValue = (long) data.getDouble("timestamp");
+        return new StatusMessage(data.getString("id"), author, timeStampLongValue, data.getString("message"));
     }
 
     private PendingIntent createGroupOnDismissedIntent(Context context, int notificationId, String groupId, String deepLink) {
         Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
         intent.putExtra("im.status.ethereum.deepLink", deepLink);
         intent.putExtra("im.status.ethereum.groupId", groupId);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, flag);
     }
 
     private PendingIntent createGroupOnTapIntent(Context context, int notificationId, String groupId, String deepLink) {
-        Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
-        intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        intent.putExtra("im.status.ethereum.groupId", groupId);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+        Intent intent = getOpenAppIntent(deepLink);
+        return PendingIntent.getActivity(context.getApplicationContext(), notificationId, intent, flag);
    }
 
     private PendingIntent createOnTapIntent(Context context, int notificationId, String deepLink) {
-        Intent intent = new Intent(ACTION_TAP_NOTIFICATION);
-        intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+        Intent intent = getOpenAppIntent(deepLink);
+        return PendingIntent.getActivity(context.getApplicationContext(), notificationId, intent, flag);
    }
 
     private PendingIntent createOnDismissedIntent(Context context, int notificationId, String deepLink) {
         Intent intent = new Intent(ACTION_DELETE_NOTIFICATION);
         intent.putExtra("im.status.ethereum.deepLink", deepLink);
-        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent,
-                PendingIntent.FLAG_CANCEL_CURRENT | PendingIntent.FLAG_MUTABLE);
+        return PendingIntent.getBroadcast(context.getApplicationContext(), notificationId, intent, flag);
     }
 
     public void removeStatusMessage(Bundle bundle) {

nix/deps/clojure/deps.json

@@ -103,45 +103,6 @@
     }
   },
 
-  {
-    "path": "cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "ff154f318e1f63061b5bd42d9a38fc8547360cb4",
-      "sha256": "166ynlrph7rx3nql0c85c37vcbcsnwbjamk71hw74rz451pgnncr"
-    },
-    "jar": {
-      "sha1": "d5c53eca9f3884402c76268b82e3828223dcbf90",
-      "sha256": "1530hwqpxzxfjm6dy77whqwjzzx79jpnd9xvnkxy1lnk7l7lj494"
-    }
-  },
-
-  {
-    "path": "cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "077d1a0973c23cbbff52dea7365dca4cf9de5ad5",
-      "sha256": "1ccm3l19cgy30hr03n8jgkgzmswdbg520zmg97xk8b16ncn964jn"
-    },
-    "jar": {
-      "sha1": "a98b94cbc84d264ba9892c971cfaf5920c2152f1",
-      "sha256": "0ym20h0h7mw1mxzm1r7smbj65x8nsqj3cszg82mw3aw4a8j32c29"
-    }
-  },
-
-  {
-    "path": "cljsjs/react/17.0.1-0/react-17.0.1-0",
-    "host": "https://repo.clojars.org",
-    "pom": {
-      "sha1": "d5d3681281585d981375fe7bb29362bfcd0d4449",
-      "sha256": "0rskh6mfq5h0l0wybs68w9v585a6zlnnfgrvsf5k3h51fk2p28da"
-    },
-    "jar": {
-      "sha1": "726da8a9305a865df90d81e9a8d58f87ff0ee8bd",
-      "sha256": "0bfmvw8gk98vdf9azll6041r1jaz1pmb0dyb35cfc8dr3mmr4ag7"
-    }
-  },
-
   {
     "path": "clout/clout/2.1.2/clout-2.1.2",
     "host": "https://repo.clojars.org",
@@ -1014,15 +975,15 @@
   },
 
   {
-    "path": "org/clojure/tools.logging/0.4.1/tools.logging-0.4.1",
+    "path": "org/clojure/tools.logging/1.1.0/tools.logging-1.1.0",
     "host": "https://repo1.maven.org/maven2",
     "pom": {
-      "sha1": "483bbfc82aee3c005bb1ad36dec77ba5d6c5f95c",
-      "sha256": "1qhfigr9am90fx527ax6f7z7xahgsd5hzb4pmi40n79nx3jsc9hf"
+      "sha1": "44b6bd9ac74cb5e2254e1f0b258d53c1829b865d",
+      "sha256": "093jy29w5gm9rp9va6qlhb6096jpf5higyk7sgmbwb5nf53qi3qb"
     },
     "jar": {
-      "sha1": "991bebc6e3633b85091ae929d62c116a2584aee7",
-      "sha256": "001sx1ddgx0ys0z1qphzpxjf2w35rikrfjc0h5bvvqbw8ra0vvja"
+      "sha1": "84cb5d00caa9df2ee504d46f6107f4708271f619",
+      "sha256": "0x2zzivn38z179lxkw9wbi9n9qwsf466lrd9y27khdz7wbxhscb5"
     }
   },
 
@@ -1352,15 +1313,15 @@
   },
 
   {
-    "path": "re-frame/re-frame/0.12.0/re-frame-0.12.0",
+    "path": "re-frame/re-frame/1.3.0/re-frame-1.3.0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "41fd34c15c1cf68eec81435e09d0a79fd8a88276",
-      "sha256": "08c3sxi3sdkay3550vb3gbv5czzdh2kyin4mb8cpd2wd5g2c88sq"
+      "sha1": "b1f70463fba018c5464d3fc0843232fe955c1372",
+      "sha256": "0yqq1kg1si0akr7kx7w1l4vvkdai20na6h6627ibqkgwzivkc5n5"
     },
     "jar": {
-      "sha1": "3ff92169fe7588ad62dad2d6ea3bf0e5d3e2d224",
-      "sha256": "1m5sjskgjx028s1zpa631bp52y9hjn8l1nr8hrwiwdh09i2kpnk2"
+      "sha1": "b7135a76432b8141027ba1f4eb6bb15a36acfb7c",
+      "sha256": "16wi01z0j4wn04kldwzxvj0pd9dianjyb000nv5611ikhxk1qrps"
     }
   },
 
@@ -1391,15 +1352,15 @@
   },
 
   {
-    "path": "reagent/reagent/1.0.0/reagent-1.0.0",
+    "path": "reagent/reagent/1.2.0/reagent-1.2.0",
     "host": "https://repo.clojars.org",
     "pom": {
-      "sha1": "93ad5ccb0101108fb0843a3f2c50da28f8fd8336",
-      "sha256": "1l4xzgc4wbd8b29mhj5j336cf8w1zccaia0w413zf3bnj6jf5m38"
+      "sha1": "d2279922777793edfc0ae9e01d68a832eb5ce52d",
+      "sha256": "1h1gk4cykidm1jx75dq426lrgf8r7900fcir5jz59zp1ka2a0ywb"
     },
     "jar": {
-      "sha1": "a1dd4d40425bb2e1afad0fe72780b43ff394ccfa",
-      "sha256": "1g607s1ymns85923bvhwrsj0y5czyqqq1jmxx0a58fnsm1b318fa"
+      "sha1": "1b9a181b5c7ed3557768d2ea0c66f5616aef5e97",
+      "sha256": "0scvkzfqjs613z10rngh7427v3pxdqablf0fcl65pbpkzz16wgav"
     }
   },
 

nix/deps/clojure/deps.list

@@ -6,9 +6,6 @@ camel-snake-kebab/camel-snake-kebab/0.4.3/camel-snake-kebab-0.4.3.jar
 cider/cider-nrepl/0.25.3/cider-nrepl-0.25.3.jar
 cider/piggieback/0.4.1/piggieback-0.4.1.jar
 cljs-bean/cljs-bean/1.3.0/cljs-bean-1.3.0.jar
-cljsjs/react-dom-server/17.0.1-0/react-dom-server-17.0.1-0.jar
-cljsjs/react-dom/17.0.1-0/react-dom-17.0.1-0.jar
-cljsjs/react/17.0.1-0/react-17.0.1-0.jar
 clout/clout/2.1.2/clout-2.1.2.jar
 com/andrewmcveigh/cljs-time/0.5.2/cljs-time-0.5.2.jar
 com/bhauman/cljs-test-display/0.1.1/cljs-test-display-0.1.1.jar
@@ -76,7 +73,7 @@ org/clojure/test.check/1.1.0/test.check-1.1.0.jar
 org/clojure/tools.analyzer.jvm/1.1.0/tools.analyzer.jvm-1.1.0.jar
 org/clojure/tools.analyzer/1.0.0/tools.analyzer-1.0.0.jar
 org/clojure/tools.cli/1.0.194/tools.cli-1.0.194.jar
-org/clojure/tools.logging/0.4.1/tools.logging-0.4.1.jar
+org/clojure/tools.logging/1.1.0/tools.logging-1.1.0.jar
 org/clojure/tools.macro/0.1.5/tools.macro-0.1.5.jar
 org/clojure/tools.reader/1.3.3/tools.reader-1.3.3.jar
 org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
@@ -102,10 +99,10 @@ org/wildfly/common/wildfly-common/1.5.2.Final/wildfly-common-1.5.2.Final.jar
 prismatic/schema/1.1.7/schema-1.1.7.jar
 quoin/quoin/0.1.2/quoin-0.1.2.jar
 re-com/re-com/2.8.0/re-com-2.8.0.jar
-re-frame/re-frame/0.12.0/re-frame-0.12.0.jar
+re-frame/re-frame/1.3.0/re-frame-1.3.0.jar
 re-frisk-remote/re-frisk-remote/1.6.0/re-frisk-remote-1.6.0.jar
 re-frisk/sente/1.15.0/sente-1.15.0.jar
-reagent/reagent/1.0.0/reagent-1.0.0.jar
+reagent/reagent/1.2.0/reagent-1.2.0.jar
 refactor-nrepl/refactor-nrepl/2.5.0/refactor-nrepl-2.5.0.jar
 ring-cors/ring-cors/0.1.8/ring-cors-0.1.8.jar
 ring/ring-codec/1.1.2/ring-codec-1.1.2.jar

nix/overlay.nix

@@ -32,18 +32,6 @@ in {
   # For parsing gradle.properties into an attrset
   gradlePropParser = callPackage ./tools/gradlePropParser.nix { };
 
-  # Clojure formatting tool
-  zprint = super.zprint.override rec {
-    buildGraalvmNativeImage = args: super.buildGraalvmNativeImage ( args // rec {
-      inherit (args) pname;
-      version = "1.2.5";
-      src = self.fetchurl {
-        url = "https://github.com/kkinnear/${pname}/releases/download/${version}/${pname}-filter-${version}";
-        sha256 = "sha256-PWdR5jqyzvTk9HoxqDldwtZNik34dmebBtZZ5vtva4A=";
-      };
-    });
-  };
-
   # Fix for missing libarclite_macosx.a in Xcode 14.3.
   # https://github.com/ios-control/ios-deploy/issues/580
   ios-deploy = super.darwin.ios-deploy.overrideAttrs (old: rec {
@@ -60,8 +48,8 @@ in {
   gradle = super.gradle_6;
   nodejs = super.nodejs-18_x;
   yarn = super.yarn.override { nodejs = super.nodejs-18_x; };
-  openjdk = super.openjdk8_headless;
-  xcodeWrapper = callPackage ./pkgs/xcodeenv/compose-xcodewrapper.nix { } {
+  openjdk = super.openjdk11_headless;
+  xcodeWrapper = super.xcodeenv.composeXcodeWrapper {
     version = "14.0";
     allowHigher = true;
   };

nix/pkgs.nix

@@ -11,11 +11,10 @@ let
   # We follow the master branch of official nixpkgs.
   nixpkgsSrc = fetchFromGitHub {
     name = "nixpkgs-source";
-    # FIXME: Fork used to get Cocoapods 1.12.0 and apksigner macOS build.
-    owner = "status-im";
+    owner = "NixOS";
     repo = "nixpkgs";
-    rev = "d0c06fa3d3982a91aa01bd63ed84020cbde3d3ab";
-    sha256 = "sha256-8blvuUHnuf0hFr/PpBxVohJp5CaGXIXhgJlFN/cv7us=";
+    rev = "e7603eba51f2c7820c0a182c6bbb351181caa8e7";
+    sha256 = "sha256-XJZ/o17eOd2sEsGif+/MQBnfa2DKmndWgJyc7CWajFc=";
     # To get the compressed Nix sha256, use:
     # nix-prefetch-url --unpack https://github.com/${ORG}/nixpkgs/archive/${REV}.tar.gz
   };

nix/pkgs/android-sdk/compose.nix

@@ -9,7 +9,7 @@
 # by setting android_sdk.accept_license = true.
 androidenv.composeAndroidPackages {
   toolsVersion = "26.1.1";
-  platformToolsVersion = "33.0.2";
+  platformToolsVersion = "33.0.3";
   buildToolsVersions = [ "30.0.0" ];
   platformVersions = [ "31" ];
   cmakeVersions = [ "3.18.1" ];

nix/pkgs/android-sdk/shell.nix

@@ -2,6 +2,7 @@
 
 mkShell {
   name = "android-sdk-shell";
+  buildInputs = [ openjdk ];
   shellHook = ''
     export JAVA_HOME="${openjdk}"
 

nix/pkgs/xcodeenv/compose-xcodewrapper.nix

@@ -1,44 +0,0 @@
-{ stdenv }:
-
-{ version ? "11.1"
-, allowHigher ? false
-, xcodeBaseDir ? "/Applications/Xcode.app" }:
-
-assert stdenv.isDarwin;
-
-stdenv.mkDerivation {
-  name = "xcode-wrapper-${version}${if allowHigher then "-plus" else ""}";
-  # Fix 'xcodebuild: Operation not permitted' when 'sandbox=relaxed' is used.
-  # https://github.com/NixOS/nixpkgs/pull/228696
-  __noChroot = stdenv.isDarwin;
-  buildCommand = ''
-    mkdir -p $out/bin
-    cd $out/bin
-    ln -s /usr/bin/xcode-select
-    ln -s /usr/bin/security
-    ln -s /usr/bin/codesign
-    ln -s /usr/bin/xcrun
-    ln -s /usr/bin/plutil
-    ln -s /usr/bin/clang
-    ln -s /usr/bin/lipo
-    ln -s /usr/bin/file
-    ln -s /usr/bin/rev
-    ln -s "${xcodeBaseDir}/Contents/Developer/usr/bin/xcodebuild"
-    ln -s "${xcodeBaseDir}/Contents/Developer/Applications/Simulator.app/Contents/MacOS/Simulator"
-
-    cd ..
-    ln -s "${xcodeBaseDir}/Contents/Developer/Platforms/iPhoneSimulator.platform/Developer/SDKs"
-
-    # Check if we have the xcodebuild version that we want
-    currVer=$($out/bin/xcodebuild -version)
-    ${if allowHigher then ''
-    if [ -z "$(printf '%s\n' "${version}" "$currVer" | sort -V | head -n1)""" != "${version}" ]
-    '' else ''
-    if [ -z "$(echo $currVer | grep -x 'Xcode ${version}')" ]
-    ''}
-    then
-        echo "We require xcodebuild version${if allowHigher then " or higher" else ""}: ${version}"
-        exit 1
-    fi
-  '';
-}

nix/shell.nix

@@ -20,7 +20,7 @@ in mkShell {
     # lint specific utilities
     clj-kondo zprint
     # other nice to have stuff
-    yarn nodejs python27
+    yarn nodejs python310
   ] # and some special cases
     ++ lib.optionals stdenv.isDarwin [ cocoapods clang tcl ]
     ++ lib.optionals (!stdenv.isDarwin) [ gcc8 ]

nix/shells.nix

@@ -57,7 +57,7 @@ let
 
     # for 'scripts/generate-keystore.sh'
     keytool = mkShell {
-      buildInputs = with pkgs; [ openjdk8 apksigner ];
+      buildInputs = with pkgs; [ openjdk apksigner ];
     };
 
     # for targets needing 'adb', 'apkanalyzer' and other SDK/NDK tools