Skip to content

Commit c035c05

Browse files
authored
Merge pull request #5 from BranchMetrics/ENGMT-2070-2
Add nix and prepare release 2.3
2 parents da9f777 + cc5eda8 commit c035c05

File tree

5 files changed

+131
-2
lines changed

5 files changed

+131
-2
lines changed

.envrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
use flake

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,4 @@ app/src/main/res/drawable/
2020
app/release
2121
app/src/main/ic_launcher-playstore.png
2222
app/src/main/res/
23+
.direnv/

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ android {
1212
applicationId = "io.branch.branchlinksimulator"
1313
minSdk = 26
1414
targetSdk = 34
15-
versionCode = 22
16-
versionName = "2.2"
15+
versionCode = 23
16+
versionName = "2.3"
1717

1818
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1919
vectorDrawables {

flake.lock

Lines changed: 96 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
description = "BranchLinkSimulatorAndroid flake";
3+
inputs = {
4+
branch-nix.url = "git+ssh://[email protected]/BranchMetrics/nix";
5+
};
6+
7+
outputs = { self, branch-nix }:
8+
let
9+
nixpkgs = branch-nix.nixpkgs;
10+
extra-pkgs = branch-nix.packages;
11+
utils = branch-nix.utils;
12+
system-utils = branch-nix.system-utils;
13+
in
14+
utils.lib.eachDefaultSystem (system:
15+
let
16+
pkgs = nixpkgs.legacyPackages.${system} // {
17+
extra-pkgs = extra-pkgs.${system};
18+
};
19+
jdk = pkgs.openjdk21;
20+
in
21+
{
22+
devShell = pkgs.mkShell {
23+
nativeBuildInputs = [
24+
jdk
25+
];
26+
JAVA_HOME = "${jdk}";
27+
};
28+
formatter = pkgs.nixpkgs-fmt;
29+
}
30+
);
31+
}

0 commit comments

Comments
 (0)