Skip to content

Commit 484c23f

Browse files
Prepare master to 1.0; update minimum julia version to 1.6 (#328)
Co-authored-by: Max Horn <[email protected]>
1 parent 351666b commit 484c23f

File tree

10 files changed

+55
-565
lines changed

10 files changed

+55
-565
lines changed

.github/workflows/test.yml

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,26 +37,20 @@ jobs:
3737
- '1.8'
3838
- '1.7'
3939
- '1.6'
40-
- '1.5'
41-
- '1.4'
42-
- '1.3'
43-
- '1.2'
44-
- '1.1'
45-
- '1.0'
4640
- 'nightly'
4741
include:
4842
- os: windows-latest
4943
julia-version: '1'
5044
- os: windows-latest
51-
julia-version: '1.0'
45+
julia-version: '1.6'
5246
- os: windows-latest
5347
julia-version: '1.12-nightly'
5448
- os: windows-latest
5549
julia-version: 'nightly'
5650
- os: macOS-latest
5751
julia-version: '1'
5852
- os: macOS-13 # macOS-14 and later require julia >= 1.8
59-
julia-version: '1.0'
53+
julia-version: '1.6'
6054
- os: macOS-latest
6155
julia-version: '1.12-nightly'
6256
- os: macOS-latest

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
77

8+
## Version [v1.0.0] - unreleased
9+
10+
### Changed
11+
12+
- The minimum supported julia version is increased to 1.6. ([#328])
13+
814
## Version [v0.8.12] - 2025-05-05
915

1016
### Changed
@@ -316,3 +322,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
316322
[#313]: https://github.com/JuliaTesting/Aqua.jl/issues/313
317323
[#319]: https://github.com/JuliaTesting/Aqua.jl/issues/319
318324
[#322]: https://github.com/JuliaTesting/Aqua.jl/issues/322
325+
[#328]: https://github.com/JuliaTesting/Aqua.jl/issues/328

Project.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
name = "Aqua"
22
uuid = "4c88cf16-eb10-579e-8560-4a9242c79595"
33
authors = ["Takafumi Arakaki <[email protected]> and contributors"]
4-
version = "0.8.12"
4+
version = "1.0.0-DEV"
55

66
[deps]
77
Compat = "34da2185-b29b-5c13-b0c7-acf172513d20"
88
Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
99
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
1010

1111
[compat]
12-
Compat = "3.12, 4"
13-
Pkg = "1.0"
12+
Compat = "4"
13+
Pkg = "1.6"
1414
Test = "<0.0.1, 1"
15-
julia = "1.0"
15+
julia = "1.6"
1616

1717
[extras]
1818
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"

src/Aqua.jl

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,9 @@ module Aqua
22

33
using Base: Docs, PkgId, UUID
44
using Pkg: Pkg, TOML, PackageSpec
5+
using Pkg.Types: VersionSpec, semver_spec
56
using Test
67

7-
@static if VERSION < v"1.1.0-DEV.472"
8-
using Compat: isnothing
9-
end
10-
@static if VERSION < v"1.3.0-DEV.349"
11-
using Compat: findfirst
12-
end
13-
14-
include("pkg/Versions.jl")
15-
using .Versions: VersionSpec, semver_spec
168

179
include("utils.jl")
1810
include("ambiguities.jl")

src/piracies.jl

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,7 @@ module Piracy
22

33
using ..Aqua: is_kwcall
44

5-
@static if VERSION >= v"1.6-"
6-
using Test: is_in_mods
7-
else
8-
function is_in_mods(m::Module, recursive::Bool, mods)
9-
while true
10-
m in mods && return true
11-
recursive || return false
12-
p = parentmodule(m)
13-
p === m && return false
14-
m = p
15-
end
16-
end
17-
end
5+
using Test: is_in_mods
186

197
# based on Test/Test.jl#detect_ambiguities
208
# https://github.com/JuliaLang/julia/blob/v1.9.1/stdlib/Test/src/Test.jl#L1838-L1896

src/pkg/LICENSE.md

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)