From 243da317ab8a9a36b7b2008cf2aac7bc92afa54a Mon Sep 17 00:00:00 2001 From: Florian Thienel Date: Mon, 30 Dec 2024 20:51:23 +0100 Subject: [PATCH] bump cabrillo version Signed-off-by: Florian Thienel --- core/export/cabrillo/cabrillo.go | 4 ++-- core/export/cabrillo/cabrillo_test.go | 2 +- go.mod | 2 +- go.sum | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/export/cabrillo/cabrillo.go b/core/export/cabrillo/cabrillo.go index 55d49c5..0eecb13 100644 --- a/core/export/cabrillo/cabrillo.go +++ b/core/export/cabrillo/cabrillo.go @@ -122,7 +122,7 @@ func (c *Controller) Run(settings core.Settings, claimedScore int, qsos []core.Q export.Address.StateProvince = c.addressStateProvince export.Address.Country = c.addressCountry export.Club = c.club - export.Custom["SPECIFIC"] = c.specific + export.Custom[cabrillo.SpecificTag] = c.specific export.Certificate = c.certificate export.Soapbox = c.soapBox @@ -325,7 +325,7 @@ func (c *Controller) CategoryOverlays() []string { string(cabrillo.YouthOverlay), string(cabrillo.NoviceTechOverlay), string(cabrillo.Over50Overlay), - "YL", // TODO: promote this to the cabrillo library + string(cabrillo.YLOverlay), } } diff --git a/core/export/cabrillo/cabrillo_test.go b/core/export/cabrillo/cabrillo_test.go index 39d89e7..ce47642 100644 --- a/core/export/cabrillo/cabrillo_test.go +++ b/core/export/cabrillo/cabrillo_test.go @@ -95,7 +95,7 @@ CALLSIGN: AA1ZZZ OPERATORS: AA2ZZZ GRID-LOCATOR: AA00aa CLAIMED-SCORE: 123 -CERTIFICATE: YES +CERTIFICATE: NO QSO: 7000 CW 2009-05-30 0002 AA1ZZZ 599 001 ABC S50A 589 004 DEF END-OF-LOG: ` diff --git a/go.mod b/go.mod index ec7631a..b5c2ab4 100644 --- a/go.mod +++ b/go.mod @@ -19,7 +19,7 @@ go 1.22.3 // replace github.com/gotk3/gotk3 => ../gotk3 require ( - github.com/ftl/cabrillo v0.2.3 + github.com/ftl/cabrillo v0.2.4 github.com/ftl/clusterix v0.1.0 github.com/ftl/conval v0.8.0 github.com/ftl/gmtry v0.0.0-20201120192810-fa4a1b99fc04 diff --git a/go.sum b/go.sum index 374a034..70d61e8 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ3 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/ftl/cabrillo v0.2.3 h1:x2Adf24QX6zQ0/OX12LJ6+2yp9sZBUpNV4Xsxb2w0H0= -github.com/ftl/cabrillo v0.2.3/go.mod h1:yrVvhb4datmP7OTEfX6gpEsTP8QNpXH0LAoatwvsjCI= +github.com/ftl/cabrillo v0.2.4 h1:htBOjPCkZIOBf4CL2QypTEb83G7+z6/YF8rAP6vGdPk= +github.com/ftl/cabrillo v0.2.4/go.mod h1:yrVvhb4datmP7OTEfX6gpEsTP8QNpXH0LAoatwvsjCI= github.com/ftl/clusterix v0.1.0 h1:+fbTybTvkVorx3B4zZ3DBiVbmLV0hhFpfDGW50Ss9cg= github.com/ftl/clusterix v0.1.0/go.mod h1:N89RHOExeAbnWqoXs/MD76uackK2/9Dcu+FooVq1tKg= github.com/ftl/conval v0.8.0 h1:ZD1b+YpNne8ED53jmDR6l3Amv+wtOveLwHQSPSGgTMc=