diff --git a/dcli/CHANGELOG.md b/dcli/CHANGELOG.md index 6ac02b0b..ea5bdc17 100644 --- a/dcli/CHANGELOG.md +++ b/dcli/CHANGELOG.md @@ -1,3 +1,6 @@ +# 3.3.4 +- Fixed a null check in the new inDocker method. + # 3.3.3 - updated the DockerShell to use /proc/1/cgroup to determine if we are in a docker container as the test for .dockerenv no longer works. diff --git a/dcli/lib/src/dcli/resource/generated/A06d49b67b870c49c422343065070f397.g.dart b/dcli/lib/src/dcli/resource/generated/A06d49b67b870c49c422343065070f397.g.dart index c8c2eef8..cbb2d8c2 100644 --- a/dcli/lib/src/dcli/resource/generated/A06d49b67b870c49c422343065070f397.g.dart +++ b/dcli/lib/src/dcli/resource/generated/A06d49b67b870c49c422343065070f397.g.dart @@ -25,7 +25,7 @@ class A06d49b67b870c49c422343065070f397 extends PackedResource { /// this checksum @override String get checksum => - '6e00b0c8101872560e27e87788da2ad7d533dc8487b54f2df2a8652db7bf29e7'; + '688802631a6f3379744d30584b498856bd7d95abd91333e65b078b370e9b6fcc'; /// /resources relative path to the original resource. @override @@ -35,7 +35,7 @@ class A06d49b67b870c49c422343065070f397 extends PackedResource { String get content => ''' bmFtZTogc2NyaXB0bmFtZQp2ZXJzaW9uOiAwLjAuMQpkZXNjcmlwdGlvbjogQSBzY3JpcHQgZ2VuZXJh dGVkIGJ5IGRjbGkuCmVudmlyb25tZW50OgogIHNkazogJz49My4wLjAgPDQuMC4wJwogIGZsdXR0ZXI6 -CmRlcGVuZGVuY2llczoKICBhcmdzOiBeMi4zLjEKICBkY2xpOiAzLjMuMwogIGRjbGlfY29yZTogMy4z -LjMKICBwYXRoOiBeMS4wLjAKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6IF40LjAuMAo= +CmRlcGVuZGVuY2llczoKICBhcmdzOiBeMi4zLjEKICBkY2xpOiAzLjMuNAogIGRjbGlfY29yZTogMy4z +LjQKICBwYXRoOiBeMS4wLjAKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6IF40LjAuMAo= '''; } diff --git a/dcli/lib/src/dcli/resource/generated/A117670ecffdae99646ec89b9fac5f34f.g.dart b/dcli/lib/src/dcli/resource/generated/A117670ecffdae99646ec89b9fac5f34f.g.dart index cd94e3a8..36e68fc4 100644 --- a/dcli/lib/src/dcli/resource/generated/A117670ecffdae99646ec89b9fac5f34f.g.dart +++ b/dcli/lib/src/dcli/resource/generated/A117670ecffdae99646ec89b9fac5f34f.g.dart @@ -25,7 +25,7 @@ class A117670ecffdae99646ec89b9fac5f34f extends PackedResource { /// this checksum @override String get checksum => - 'b74fad849762655fd8bf0d4cd6196971e17330882fca1b087aa0dd6420faab33'; + '0d2acf104a9ae09b970e79337f960111ba2e6af9ec6b1033c9a97bd6c87879da'; /// /resources relative path to the original resource. @override @@ -35,7 +35,7 @@ class A117670ecffdae99646ec89b9fac5f34f extends PackedResource { String get content => ''' bmFtZTogY29uc29sZV9zaW1wbGUKdmVyc2lvbjogMC4wLjEKZGVzY3JpcHRpb246IEEgc2ltcGxlIGNv bW1hbmQtbGluZSBhcHBsaWNhdGlvbiBjcmVhdGVkIGJ5IGRjbGkKZW52aXJvbm1lbnQ6CiAgc2RrOiAn -Pj0zLjAuMCA8NC4wLjAnCiAgZmx1dHRlcjoKZGVwZW5kZW5jaWVzOgogIGRjbGk6IDMuMy4zCiAgZGNs -aV9jb3JlOiAzLjMuMwpkZXZfZGVwZW5kZW5jaWVzOgogIGxpbnRfaGFyZDogXjMuMC4wCg== +Pj0zLjAuMCA8NC4wLjAnCiAgZmx1dHRlcjoKZGVwZW5kZW5jaWVzOgogIGRjbGk6IDMuMy40CiAgZGNs +aV9jb3JlOiAzLjMuNApkZXZfZGVwZW5kZW5jaWVzOgogIGxpbnRfaGFyZDogXjMuMC4wCg== '''; } diff --git a/dcli/lib/src/dcli/resource/generated/A11add8376c80bbf88e645723e11f097a.g.dart b/dcli/lib/src/dcli/resource/generated/A11add8376c80bbf88e645723e11f097a.g.dart index 8f0f098d..ecf1fe56 100644 --- a/dcli/lib/src/dcli/resource/generated/A11add8376c80bbf88e645723e11f097a.g.dart +++ b/dcli/lib/src/dcli/resource/generated/A11add8376c80bbf88e645723e11f097a.g.dart @@ -25,7 +25,7 @@ class A11add8376c80bbf88e645723e11f097a extends PackedResource { /// this checksum @override String get checksum => - 'c7dc7028873b1c19412b03385a8873e561d8cb2559c5aeac9fe6efda753184dc'; + '66a348cfafce3d955308cd1d99b58067f4e8f1f265b6007c19c30cfaa3f17dd8'; /// /resources relative path to the original resource. @override @@ -37,7 +37,7 @@ bmFtZTogZnVsbAp2ZXJzaW9uOiAwLjAuMQpwdWJsaXNoX3RvOiBodHRwczovL2JldGEub25lcHViLmRl di9hcGkvamJieHBzZGF2dS8KZGVzY3JpcHRpb246IEEgc2FtcGxlIGNvbW1hbmQtbGluZSBhcHBsaWNh dGlvbiB0aGF0IGluc3RhbGxzIGFuZCBydW5zIG1haWxob2cKZW52aXJvbm1lbnQ6CiAgc2RrOiAnPj0z LjAuMCA8NC4wLjAnCiAgZmx1dHRlcjoKZGVwZW5kZW5jaWVzOgogIGFyZ3M6IF4yLjMuMQogIGRjbGk6 -IDMuMy4zCiAgZGNsaV9jb3JlOiAzLjMuMwogIGh0dHA6IF4wLjEzLjQKICBwYXRoOiBeMS44LjEKICBz +IDMuMy40CiAgZGNsaV9jb3JlOiAzLjMuNAogIGh0dHA6IF4wLjEzLjQKICBwYXRoOiBeMS44LjEKICBz ZXR0aW5nc195YW1sOiBeNy4wLjAKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6IF40LjAuMApl eGVjdXRhYmxlczoKICBmdWxsOgogICAgZnVsbDoK '''; diff --git a/dcli/lib/src/dcli/resource/generated/Ab3d3a29275d9f1652f2de5c6e4115a24.g.dart b/dcli/lib/src/dcli/resource/generated/Ab3d3a29275d9f1652f2de5c6e4115a24.g.dart index 8ad059a8..55d4ff7e 100644 --- a/dcli/lib/src/dcli/resource/generated/Ab3d3a29275d9f1652f2de5c6e4115a24.g.dart +++ b/dcli/lib/src/dcli/resource/generated/Ab3d3a29275d9f1652f2de5c6e4115a24.g.dart @@ -25,7 +25,7 @@ class Ab3d3a29275d9f1652f2de5c6e4115a24 extends PackedResource { /// this checksum @override String get checksum => - '0143def958c2d97c40c89046b1ccc908e7504c515557b0f00692d325ed52328f'; + 'b780b1e3a4fb1a3125a979f83e89823b9386adfb2681f467e5dea86b88d6ba16'; /// /resources relative path to the original resource. @override @@ -36,7 +36,7 @@ class Ab3d3a29275d9f1652f2de5c6e4115a24 extends PackedResource { bmFtZTogY29uc29sZV9zaW1wbGUKdmVyc2lvbjogMC4wLjEKZGVzY3JpcHRpb246IEEgc2ltcGxlIGNv bW1hbmQtbGluZSBhcHBsaWNhdGlvbiBjcmVhdGVkIGJ5IGRjbGkKZW52aXJvbm1lbnQ6CiAgc2RrOiAn Pj0zLjAuMCA8NC4wLjAnCiAgZmx1dHRlcjoKZGVwZW5kZW5jaWVzOgogIGFyZ3M6IF4yLjQuMgogIGRj -bGk6IDMuMy4zCiAgZGNsaV9jb3JlOiAzLjMuMwoKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6 +bGk6IDMuMy40CiAgZGNsaV9jb3JlOiAzLjMuNAoKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6 IF40LjAuMAo= '''; } diff --git a/dcli/lib/src/dcli/resource/generated/Af621a8bd8d9680d9847c1d0246fa9ffe.g.dart b/dcli/lib/src/dcli/resource/generated/Af621a8bd8d9680d9847c1d0246fa9ffe.g.dart index 1c185805..f847416b 100644 --- a/dcli/lib/src/dcli/resource/generated/Af621a8bd8d9680d9847c1d0246fa9ffe.g.dart +++ b/dcli/lib/src/dcli/resource/generated/Af621a8bd8d9680d9847c1d0246fa9ffe.g.dart @@ -25,7 +25,7 @@ class Af621a8bd8d9680d9847c1d0246fa9ffe extends PackedResource { /// this checksum @override String get checksum => - '6e00b0c8101872560e27e87788da2ad7d533dc8487b54f2df2a8652db7bf29e7'; + '688802631a6f3379744d30584b498856bd7d95abd91333e65b078b370e9b6fcc'; /// /resources relative path to the original resource. @override @@ -35,7 +35,7 @@ class Af621a8bd8d9680d9847c1d0246fa9ffe extends PackedResource { String get content => ''' bmFtZTogc2NyaXB0bmFtZQp2ZXJzaW9uOiAwLjAuMQpkZXNjcmlwdGlvbjogQSBzY3JpcHQgZ2VuZXJh dGVkIGJ5IGRjbGkuCmVudmlyb25tZW50OgogIHNkazogJz49My4wLjAgPDQuMC4wJwogIGZsdXR0ZXI6 -CmRlcGVuZGVuY2llczoKICBhcmdzOiBeMi4zLjEKICBkY2xpOiAzLjMuMwogIGRjbGlfY29yZTogMy4z -LjMKICBwYXRoOiBeMS4wLjAKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6IF40LjAuMAo= +CmRlcGVuZGVuY2llczoKICBhcmdzOiBeMi4zLjEKICBkY2xpOiAzLjMuNAogIGRjbGlfY29yZTogMy4z +LjQKICBwYXRoOiBeMS4wLjAKZGV2X2RlcGVuZGVuY2llczoKICBsaW50X2hhcmQ6IF40LjAuMAo= '''; } diff --git a/dcli/lib/src/version/version.g.dart b/dcli/lib/src/version/version.g.dart index a18a6819..546fd8fa 100644 --- a/dcli/lib/src/version/version.g.dart +++ b/dcli/lib/src/version/version.g.dart @@ -1,3 +1,3 @@ /// GENERATED BY pub_release do not modify. /// Instance of 'Name' version -String packageVersion = '3.3.3'; +String packageVersion = '3.3.4'; diff --git a/template/project/cmd_args/pubspec.yaml b/template/project/cmd_args/pubspec.yaml index 5d788294..271a4f99 100644 --- a/template/project/cmd_args/pubspec.yaml +++ b/template/project/cmd_args/pubspec.yaml @@ -6,8 +6,8 @@ environment: flutter: dependencies: args: ^2.3.1 - dcli: 3.3.3 - dcli_core: 3.3.3 + dcli: 3.3.4 + dcli_core: 3.3.4 path: ^1.0.0 dev_dependencies: lint_hard: ^4.0.0 diff --git a/template/project/find/pubspec.yaml b/template/project/find/pubspec.yaml index 5d788294..271a4f99 100644 --- a/template/project/find/pubspec.yaml +++ b/template/project/find/pubspec.yaml @@ -6,8 +6,8 @@ environment: flutter: dependencies: args: ^2.3.1 - dcli: 3.3.3 - dcli_core: 3.3.3 + dcli: 3.3.4 + dcli_core: 3.3.4 path: ^1.0.0 dev_dependencies: lint_hard: ^4.0.0 diff --git a/template/project/full/pubspec.yaml b/template/project/full/pubspec.yaml index 3c5fd000..daf6d015 100644 --- a/template/project/full/pubspec.yaml +++ b/template/project/full/pubspec.yaml @@ -7,8 +7,8 @@ environment: flutter: dependencies: args: ^2.3.1 - dcli: 3.3.3 - dcli_core: 3.3.3 + dcli: 3.3.4 + dcli_core: 3.3.4 http: ^0.13.4 path: ^1.8.1 settings_yaml: ^7.0.0 diff --git a/template/project/simple/pubspec.yaml b/template/project/simple/pubspec.yaml index af322b32..0e03aee1 100644 --- a/template/project/simple/pubspec.yaml +++ b/template/project/simple/pubspec.yaml @@ -5,7 +5,7 @@ environment: sdk: '>=3.0.0 <4.0.0' flutter: dependencies: - dcli: 3.3.3 - dcli_core: 3.3.3 + dcli: 3.3.4 + dcli_core: 3.3.4 dev_dependencies: lint_hard: ^3.0.0 diff --git a/template/script/pubspec.yaml b/template/script/pubspec.yaml index 3d689598..fb53f83d 100644 --- a/template/script/pubspec.yaml +++ b/template/script/pubspec.yaml @@ -6,8 +6,8 @@ environment: flutter: dependencies: args: ^2.4.2 - dcli: 3.3.3 - dcli_core: 3.3.3 + dcli: 3.3.4 + dcli_core: 3.3.4 dev_dependencies: lint_hard: ^4.0.0