diff --git a/.env.fish b/.autoenv.fish similarity index 58% rename from .env.fish rename to .autoenv.fish index 98b32ae0f..389a47c01 100644 --- a/.env.fish +++ b/.autoenv.fish @@ -1,4 +1,3 @@ -echo "Configuring env for Exoscale" set -gx GIT_ROOT (git rev-parse --show-toplevel) diff --git a/.envrc b/.envrc new file mode 100644 index 000000000..70e6e3707 --- /dev/null +++ b/.envrc @@ -0,0 +1,3 @@ +use flake + +export GIT_ROOT=$(git rev-parse --show-toplevel) diff --git a/.gitignore b/.gitignore index 60f16ee2b..e74860100 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,5 @@ local .local out/ tmp.units.lca.jar +.direnv +**/.DS_Store diff --git a/flake.lock b/flake.lock new file mode 100644 index 000000000..30aa41ecc --- /dev/null +++ b/flake.lock @@ -0,0 +1,61 @@ +{ + "nodes": { + "flake-utils": { + "inputs": { + "systems": "systems" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1761999846, + "narHash": "sha256-IYlYnp4O4dzEpL77BD/lj5NnJy2J8qbHkNSFiPBCbqo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3de8f8d73e35724bf9abef41f1bdbedda1e14a31", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-25.05", + "repo": "nixpkgs", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs" + } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 000000000..fe3018c5c --- /dev/null +++ b/flake.nix @@ -0,0 +1,23 @@ +{ + inputs = { + nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; + flake-utils.url = "github:numtide/flake-utils"; + }; + description = "LCAAC flake"; + outputs = inputs@{ nixpkgs, flake-utils, ...}: + flake-utils.lib.eachDefaultSystem ( + system: + let + pkgs = nixpkgs.legacyPackages.${system}; + in + { + devShells.default = pkgs.mkShell { + name = "lcaac-dev-shell"; + packages = with pkgs; [ + jdk17 + gradle + ]; + }; + } + ); +} diff --git a/gradle.properties b/gradle.properties index e29bb3685..b6053d684 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,4 +2,4 @@ javaVersion=17 gradleVersion=7.6 org.gradle.jvmargs=-Xmx4096m lcaacGroup=ch.kleis.lcaac -lcaacVersion=1.8.0 +lcaacVersion=2.0.0 diff --git a/plugin/CHANGELOG.md b/plugin/CHANGELOG.md index 176290877..e80eba8b2 100644 --- a/plugin/CHANGELOG.md +++ b/plugin/CHANGELOG.md @@ -4,6 +4,11 @@ ## [Unreleased] +## [2.0.1] + +- Adapt to latest idea build `252.*` +- Updated dependency LCAAC core + ## [1.8.0] - Updated dependency LCAAC core diff --git a/plugin/build.gradle.kts b/plugin/build.gradle.kts index 1b60cf320..9e5473243 100644 --- a/plugin/build.gradle.kts +++ b/plugin/build.gradle.kts @@ -47,7 +47,7 @@ sourceSets { } dependencies { - implementation("ch.kleis.lcaac:core:1.8.0") + implementation("ch.kleis.lcaac:core:2.0.0") implementation(files(layout.buildDirectory.dir("stdlib/ef3.1")) { builtBy("generateEmissionFactors31") diff --git a/plugin/gradle.properties b/plugin/gradle.properties index 403848856..57d6a300c 100644 --- a/plugin/gradle.properties +++ b/plugin/gradle.properties @@ -2,7 +2,7 @@ pluginName=lcaac-plugin # See https://plugins.jetbrains.com/docs/intellij/build-number-ranges.html # for insight into build numbers and IntelliJ Platform versions. pluginSinceBuild=231 -pluginUntilBuild=251.* +pluginUntilBuild=252.* # IntelliJ Platform Properties -> https://github.com/JetBrains/gradle-intellij-plugin#intellij-platform-properties platformType=IC platformVersion=2023.1.2