diff --git a/GNUmakefile b/GNUmakefile index bb2130c3..71496700 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -16,9 +16,9 @@ MAKEFLAGS += --no-builtin-rules ## LD := Linker. ## ANDROID_SDK := Path to the Android SDK. -VERSION_CODE := 37 -VERSION_CODE_IOS := 13 -VERSION_NUMBER := 0.0.31 +VERSION_CODE := 38 +VERSION_CODE_IOS := 14 +VERSION_NUMBER := 0.0.32-wip VERSION_NAME := This program kills fascists. IPHONEOS_VERSION_MIN=14.0 diff --git a/default.nix b/default.nix index af8700f0..ccf87746 100644 --- a/default.nix +++ b/default.nix @@ -25,14 +25,14 @@ }: pkgs.stdenv.mkDerivation rec { pname = "tildefriends"; - version = "0.0.30"; + version = "0.0.31"; src = pkgs.fetchFromGitea { domain = "dev.tildefriends.net"; owner = "cory"; repo = "tildefriends"; rev = "v${version}"; - hash = "sha256-t5yvouzSL2j/ge1VHLqzIZ+Avqj4iEDt7L+yrHoTZAQ="; + hash = "sha256-c2ZKVNikI5jN5GQuvp7S53qqnRZniSrJMF1FUZdVNPI="; fetchSubmodules = true; }; diff --git a/docs/release_checklist.md b/docs/release_checklist.md index a38134ea..55e63d00 100644 --- a/docs/release_checklist.md +++ b/docs/release_checklist.md @@ -14,7 +14,7 @@ - upload to Apple with dist-ios on macos - nix - june and december: update release version - - run `nix flake update` + - run `nix --extra-experimental-features nix-command --extra-experimental-features flakes flake update` - comment out the hash in default.nix - update the version - run `nix-build` diff --git a/flake.lock b/flake.lock index 697e0780..66014972 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1745279238, - "narHash": "sha256-AQ7M9wTa/Pa/kK5pcGTgX/DGqMHyzsyINfN7ktsI7Fo=", + "lastModified": 1748037224, + "narHash": "sha256-92vihpZr6dwEMV6g98M5kHZIttrWahb9iRPBm1atcPk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9684b53175fc6c09581e94cc85f05ab77464c7e3", + "rev": "f09dede81861f3a83f7f06641ead34f02f37597f", "type": "github" }, "original": { diff --git a/src/android/AndroidManifest.xml b/src/android/AndroidManifest.xml index 6cec128e..0500df36 100644 --- a/src/android/AndroidManifest.xml +++ b/src/android/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="38" + android:versionName="0.0.32-wip"> CFBundlePackageType APPL CFBundleShortVersionString - 0.0.31 + 0.0.32 CFBundleSupportedPlatforms iPhoneOS CFBundleVersion - 13 + 14 DTPlatformName iphoneos LSRequiresIPhoneOS diff --git a/src/version.h b/src/version.h index 9c7f3e95..95c5b4a4 100644 --- a/src/version.h +++ b/src/version.h @@ -1,2 +1,2 @@ -#define VERSION_NUMBER "0.0.31" +#define VERSION_NUMBER "0.0.32-wip" #define VERSION_NAME "This program kills fascists."