Skip to content

Commit c24dd6d

Browse files
authored
Merge pull request #180 from b-open-io/fix-release-and-dependencies
chore: update dependencies and golangci-lint
2 parents d4a866b + fc80f12 commit c24dd6d

File tree

278 files changed

+720
-718
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

278 files changed

+720
-718
lines changed

.github/workflows/golangci-lint.yaml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ on:
1010

1111
env:
1212
GO_VERSION: '1.24'
13-
GOLANGCI_LINT_VERSION: v2.1.1
13+
GOLANGCI_LINT_VERSION: v2.1.6
1414

1515
jobs:
1616
detect-modules:
@@ -37,7 +37,8 @@ jobs:
3737
with:
3838
go-version: ${{ env.GO_VERSION }}
3939
- name: golangci-lint ${{ matrix.modules }}
40-
uses: golangci/golangci-lint-action@v6
40+
uses: golangci/golangci-lint-action@v8
4141
with:
4242
version: ${{ env.GOLANGCI_LINT_VERSION }}
43-
working-directory: ${{ matrix.modules }}
43+
working-directory: ${{ matrix.modules }}
44+
args: --path-prefix=${{ matrix.modules }}/

.github/workflows/sonar.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ permissions:
1313

1414
env:
1515
GO_VERSION: '1.24'
16-
GOLANGCI_LINT_VERSION: v2.1.1
16+
GOLANGCI_LINT_VERSION: v2.1.6
1717

1818
jobs:
1919
sonarcloud:
@@ -41,13 +41,13 @@ jobs:
4141

4242
# Re-run golangci separately without exiting on errors and generating a report for use in Sonar
4343
- name: golangci-lint
44-
uses: golangci/golangci-lint-action@v6
44+
uses: golangci/golangci-lint-action@v8
4545
with:
4646
version: ${{ env.GOLANGCI_LINT_VERSION }}
47-
args: --timeout=5m --issues-exit-code=0 --out-format=checkstyle:golangci-lint-report.xml
47+
args: --timeout=5m --issues-exit-code=0 --output.checkstyle.path=golangci-lint-report.xml
4848

4949
- name: SonarCloud Scan
50-
uses: SonarSource/sonarcloud-github-action@master
50+
uses: SonarSource/sonarqube-scan-action@v5.0.0
5151
env:
5252
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5353
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

.golangci.yml

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
version: "2"
22

3-
issues:
4-
exclude-rules:
5-
- linters:
6-
- staticcheck
7-
text: "SA1019:"
3+
linters:
4+
exclusions:
5+
rules:
6+
- linters:
7+
- staticcheck
8+
text: "SA1019:"

.vscode/settings.json

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,23 @@
44
"projectKey": "bitcoin-sv_go-sdk"
55
},
66
"workbench.colorCustomizations": {
7-
"activityBar.activeBackground": "#e7a213",
8-
"activityBar.background": "#e7a213",
7+
"activityBar.activeBackground": "#3399ff",
8+
"activityBar.background": "#3399ff",
99
"activityBar.foreground": "#15202b",
1010
"activityBar.inactiveForeground": "#15202b99",
11-
"activityBarBadge.background": "#e2fdf4",
12-
"activityBarBadge.foreground": "#15202b",
13-
"commandCenter.border": "#15202b99",
14-
"sash.hoverBorder": "#e7a213",
15-
"statusBar.background": "#b8810f",
16-
"statusBar.foreground": "#15202b",
17-
"statusBarItem.hoverBackground": "#89600b",
18-
"statusBarItem.remoteBackground": "#b8810f",
19-
"statusBarItem.remoteForeground": "#15202b",
20-
"titleBar.activeBackground": "#b8810f",
21-
"titleBar.activeForeground": "#15202b",
22-
"titleBar.inactiveBackground": "#b8810f99",
23-
"titleBar.inactiveForeground": "#15202b99"
11+
"activityBarBadge.background": "#bf0060",
12+
"activityBarBadge.foreground": "#e7e7e7",
13+
"commandCenter.border": "#e7e7e799",
14+
"sash.hoverBorder": "#3399ff",
15+
"statusBar.background": "#007fff",
16+
"statusBar.foreground": "#e7e7e7",
17+
"statusBarItem.hoverBackground": "#3399ff",
18+
"statusBarItem.remoteBackground": "#007fff",
19+
"statusBarItem.remoteForeground": "#e7e7e7",
20+
"titleBar.activeBackground": "#007fff",
21+
"titleBar.activeForeground": "#e7e7e7",
22+
"titleBar.inactiveBackground": "#007fff99",
23+
"titleBar.inactiveForeground": "#e7e7e799"
2424
},
25-
"peacock.color": "#b8810f"
25+
"peacock.color": "#007fff"
2626
}

auth/certificates/certificate.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ import (
99
"context"
1010
"errors"
1111
"fmt"
12-
ec "github.com/bsv-blockchain/go-sdk/primitives/ec"
13-
"github.com/bsv-blockchain/go-sdk/transaction"
14-
"github.com/bsv-blockchain/go-sdk/wallet"
15-
"github.com/bsv-blockchain/go-sdk/wallet/serializer"
12+
ec "github.com/bsv-blockchain/go-sdk/v2/primitives/ec"
13+
"github.com/bsv-blockchain/go-sdk/v2/transaction"
14+
"github.com/bsv-blockchain/go-sdk/v2/wallet"
15+
"github.com/bsv-blockchain/go-sdk/v2/wallet/serializer"
1616
)
1717

1818
var (

auth/certificates/certificate_test.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ import (
44
"encoding/base64"
55
"testing"
66

7-
ec "github.com/bsv-blockchain/go-sdk/primitives/ec"
8-
"github.com/bsv-blockchain/go-sdk/transaction"
9-
tu "github.com/bsv-blockchain/go-sdk/util/test_util"
10-
"github.com/bsv-blockchain/go-sdk/wallet"
7+
ec "github.com/bsv-blockchain/go-sdk/v2/primitives/ec"
8+
"github.com/bsv-blockchain/go-sdk/v2/transaction"
9+
tu "github.com/bsv-blockchain/go-sdk/v2/util/test_util"
10+
"github.com/bsv-blockchain/go-sdk/v2/wallet"
1111
"github.com/stretchr/testify/assert"
1212
"github.com/stretchr/testify/require"
1313
)

auth/certificates/completed_proto.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ import (
44
"context"
55
"errors"
66

7-
ec "github.com/bsv-blockchain/go-sdk/primitives/ec"
8-
"github.com/bsv-blockchain/go-sdk/wallet"
7+
ec "github.com/bsv-blockchain/go-sdk/v2/primitives/ec"
8+
"github.com/bsv-blockchain/go-sdk/v2/wallet"
99
)
1010

1111
// CompletedProtoWallet embeds the ProtoWallet and implements wallet.Interface

auth/certificates/master.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import (
77
"errors"
88
"fmt"
99

10-
ec "github.com/bsv-blockchain/go-sdk/primitives/ec"
11-
"github.com/bsv-blockchain/go-sdk/transaction"
12-
"github.com/bsv-blockchain/go-sdk/wallet"
10+
ec "github.com/bsv-blockchain/go-sdk/v2/primitives/ec"
11+
"github.com/bsv-blockchain/go-sdk/v2/transaction"
12+
"github.com/bsv-blockchain/go-sdk/v2/wallet"
1313
)
1414

1515
var (

auth/certificates/master_test.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ import (
1010
"strings"
1111
"testing"
1212

13-
"github.com/bsv-blockchain/go-sdk/auth/certificates"
14-
"github.com/bsv-blockchain/go-sdk/auth/utils"
15-
"github.com/bsv-blockchain/go-sdk/chainhash"
16-
ec "github.com/bsv-blockchain/go-sdk/primitives/ec"
17-
"github.com/bsv-blockchain/go-sdk/transaction"
18-
"github.com/bsv-blockchain/go-sdk/wallet"
13+
"github.com/bsv-blockchain/go-sdk/v2/auth/certificates"
14+
"github.com/bsv-blockchain/go-sdk/v2/auth/utils"
15+
"github.com/bsv-blockchain/go-sdk/v2/chainhash"
16+
ec "github.com/bsv-blockchain/go-sdk/v2/primitives/ec"
17+
"github.com/bsv-blockchain/go-sdk/v2/transaction"
18+
"github.com/bsv-blockchain/go-sdk/v2/wallet"
1919
)
2020

2121
func TestMasterCertificate(t *testing.T) {

auth/certificates/verifiable.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"errors"
77
"fmt"
88

9-
primitives "github.com/bsv-blockchain/go-sdk/primitives/ec"
10-
"github.com/bsv-blockchain/go-sdk/wallet"
9+
primitives "github.com/bsv-blockchain/go-sdk/v2/primitives/ec"
10+
"github.com/bsv-blockchain/go-sdk/v2/wallet"
1111
)
1212

1313

0 commit comments

Comments
 (0)