Skip to content

Commit 3960f00

Browse files
committed
Merge branch 'dev_0.9.21'
# Conflicts: # .github/workflows/GitHub_Actions_CI.yaml # .zenodo.json # DESCRIPTION # Luminescence.BuildResults/Luminescence-TimingExamples.0.9.19.9000-40.pdf # Luminescence.BuildResults/Luminescence-TimingExamples.0.9.20.pdf # Luminescence.BuildResults/Luminescence-TimingExamples.0.9.21.pdf # Luminescence.BuildResults/Luminescence_0.9.19.9000-40-Functions.csv # Luminescence.BuildResults/Luminescence_0.9.19.9000-40-Functions.html # Luminescence.BuildResults/Luminescence_0.9.19.9000-40-Functions.tex # Luminescence.BuildResults/Luminescence_0.9.19.9000-40-Functions_Markdown.md # Luminescence.BuildResults/Luminescence_0.9.19.9000-40-bibliography.bib # Luminescence.BuildResults/Luminescence_0.9.19.9000-40-fun_bibliography.bib # Luminescence.BuildResults/Luminescence_0.9.20-Functions.csv # Luminescence.BuildResults/Luminescence_0.9.20-Functions.html # Luminescence.BuildResults/Luminescence_0.9.20-Functions.tex # Luminescence.BuildResults/Luminescence_0.9.20-Functions_Markdown.md # Luminescence.BuildResults/Luminescence_0.9.20-bibliography.bib # Luminescence.BuildResults/Luminescence_0.9.20-fun_bibliography.bib # Luminescence.BuildResults/Luminescence_0.9.21-Functions.csv # Luminescence.BuildResults/Luminescence_0.9.21-Functions.html # Luminescence.BuildResults/Luminescence_0.9.21-Functions.tex # Luminescence.BuildResults/Luminescence_0.9.21-Functions_Markdown.md # Luminescence.BuildResults/Luminescence_0.9.21-bibliography.bib # Luminescence.BuildResults/Luminescence_0.9.21-fun_bibliography.bib # NEWS.Rmd # NEWS.md # R/combine_De_Dr.R # R/internals_RLum.R # docs/404.html # docs/LICENSE-text.html # docs/authors.html # docs/index.html # docs/news/index.html # docs/pkgdown.yml # docs/reference/Analyse_SAR.OSLdata.html # docs/reference/BaseDataSet.ConversionFactors.html # docs/reference/BaseDataSet.CosmicDoseRate.html # docs/reference/BaseDataSet.FractionalGammaDose.html # docs/reference/BaseDataSet.GrainSizeAttenuation.html # docs/reference/CW2pHMi.html # docs/reference/CW2pLM.html # docs/reference/CW2pLMi.html # docs/reference/CW2pPMi.html # docs/reference/ExampleData.Al2O3C.html # docs/reference/ExampleData.BINfileData.html # docs/reference/ExampleData.CW_OSL_Curve.html # docs/reference/ExampleData.CobbleData.html # docs/reference/ExampleData.DeValues.html # docs/reference/ExampleData.Fading-1.png # docs/reference/ExampleData.Fading-2.png # docs/reference/ExampleData.Fading.html # docs/reference/ExampleData.FittingLM.html # docs/reference/ExampleData.LxTxData.html # docs/reference/ExampleData.LxTxOSLData.html # docs/reference/ExampleData.MortarData.html # docs/reference/ExampleData.RLum.Analysis.html # docs/reference/ExampleData.RLum.Data.Image.html # docs/reference/ExampleData.ScaleGammaDose.html # docs/reference/ExampleData.SurfaceExposure.html # docs/reference/ExampleData.TR_OSL.html # docs/reference/ExampleData.XSYG.html # docs/reference/ExampleData.portableOSL.html # docs/reference/GitHub-API.html # docs/reference/Luminescence-package.html # docs/reference/PSL2Risoe.BINfileData.html # docs/reference/RLum-class.html # docs/reference/RLum.Analysis-class.html # docs/reference/RLum.Data-class.html # docs/reference/RLum.Data.Curve-class.html # docs/reference/RLum.Data.Image-class.html # docs/reference/RLum.Data.Spectrum-class.html # docs/reference/RLum.Results-class.html # docs/reference/Risoe.BINfileData-class.html # docs/reference/Risoe.BINfileData2RLum.Analysis.html # docs/reference/Second2Gray.html # docs/reference/analyse_Al2O3C_CrossTalk.html # docs/reference/analyse_Al2O3C_ITC-1.png # docs/reference/analyse_Al2O3C_ITC.html # docs/reference/analyse_Al2O3C_Measurement.html # docs/reference/analyse_FadingMeasurement.html # docs/reference/analyse_IRSAR.RF.html # docs/reference/analyse_SAR.CWOSL.html # docs/reference/analyse_SAR.TL-2.png # docs/reference/analyse_SAR.TL.html # docs/reference/analyse_baSAR.html # docs/reference/analyse_pIRIRSequence.html # docs/reference/analyse_portableOSL-1.png # docs/reference/analyse_portableOSL-2.png # docs/reference/analyse_portableOSL.html # docs/reference/apply_CosmicRayRemoval.html # docs/reference/apply_EfficiencyCorrection.html # docs/reference/as.html # docs/reference/bin_RLum.Data.html # docs/reference/calc_AliquotSize.html # docs/reference/calc_AverageDose.html # docs/reference/calc_CentralDose.html # docs/reference/calc_CobbleDoseRate.html # docs/reference/calc_CommonDose.html # docs/reference/calc_CosmicDoseRate.html # docs/reference/calc_FadingCorr.html # docs/reference/calc_FastRatio.html # docs/reference/calc_FiniteMixture.html # docs/reference/calc_FuchsLang2001.html # docs/reference/calc_HomogeneityTest.html # docs/reference/calc_Huntley2006-3.png # docs/reference/calc_Huntley2006-4.png # docs/reference/calc_Huntley2006.html # docs/reference/calc_IEU.html # docs/reference/calc_Kars2008-1.png # docs/reference/calc_Kars2008-2.png # docs/reference/calc_Kars2008-3.png # docs/reference/calc_Kars2008-4.png # docs/reference/calc_Kars2008.html # docs/reference/calc_Lamothe2003.html # docs/reference/calc_MaxDose.html # docs/reference/calc_MinDose.html # docs/reference/calc_OSLLxTxDecomposed.html # docs/reference/calc_OSLLxTxRatio.html # docs/reference/calc_SourceDoseRate.html # docs/reference/calc_Statistics.html # docs/reference/calc_TLLxTxRatio.html # docs/reference/calc_ThermalLifetime.html # docs/reference/calc_WodaFuchs2008.html # docs/reference/calc_gSGC.html # docs/reference/calc_gSGC_feldspar.html # docs/reference/combine_De_Dr.html # docs/reference/convert_Activity2Concentration.html # docs/reference/convert_BIN2CSV.html # docs/reference/convert_Concentration2DoseRate.html # docs/reference/convert_Daybreak2CSV.html # docs/reference/convert_PSL2CSV.html # docs/reference/convert_RLum2Risoe.BINfileData.html # docs/reference/convert_SG2MG.html # docs/reference/convert_Wavelength2Energy-2.png # docs/reference/convert_Wavelength2Energy.html # docs/reference/convert_XSYG2CSV.html # docs/reference/extdata.html # docs/reference/extract_IrradiationTimes.html # docs/reference/extract_ROI-1.png # docs/reference/extract_ROI.html # docs/reference/fit_CWCurve-1.png # docs/reference/fit_CWCurve.html # docs/reference/fit_EmissionSpectra-1.png # docs/reference/fit_EmissionSpectra.html # docs/reference/fit_LMCurve.html # docs/reference/fit_OSLLifeTimes.html # docs/reference/fit_SurfaceExposure.html # docs/reference/fit_ThermalQuenching.html # docs/reference/get_Layout.html # docs/reference/get_Quote.html # docs/reference/get_RLum.html # docs/reference/get_Risoe.BINfileData.html # docs/reference/get_rightAnswer.html # docs/reference/index.html # docs/reference/install_DevelopmentVersion.html # docs/reference/length_RLum.html # docs/reference/merge_RLum.Analysis.html # docs/reference/merge_RLum.Data.Curve.html # docs/reference/merge_RLum.Results.html # docs/reference/merge_RLum.html # docs/reference/merge_Risoe.BINfileData.html # docs/reference/methods_RLum.html # docs/reference/names_RLum.html # docs/reference/plot_AbanicoPlot.html # docs/reference/plot_DRCSummary-1.png # docs/reference/plot_DRCSummary.html # docs/reference/plot_DRTResults-3.png # docs/reference/plot_DRTResults-4.png # docs/reference/plot_DRTResults-5.png # docs/reference/plot_DRTResults-6.png # docs/reference/plot_DRTResults-9.png # docs/reference/plot_DRTResults.html # docs/reference/plot_DetPlot.html # docs/reference/plot_FilterCombinations-1.png # docs/reference/plot_FilterCombinations-2.png # docs/reference/plot_FilterCombinations-3.png # docs/reference/plot_FilterCombinations.html # docs/reference/plot_GrowthCurve-1.png # docs/reference/plot_GrowthCurve-2.png # docs/reference/plot_GrowthCurve-3.png # docs/reference/plot_GrowthCurve-4.png # docs/reference/plot_GrowthCurve-6.png # docs/reference/plot_GrowthCurve.html # docs/reference/plot_Histogram.html # docs/reference/plot_KDE.html # docs/reference/plot_NRt.html # docs/reference/plot_OSLAgeSummary.html # docs/reference/plot_RLum.Analysis.html # docs/reference/plot_RLum.Data.Curve.html # docs/reference/plot_RLum.Data.Image.html # docs/reference/plot_RLum.Data.Spectrum-4.png # docs/reference/plot_RLum.Data.Spectrum.html # docs/reference/plot_RLum.Results.html # docs/reference/plot_RLum.html # docs/reference/plot_ROI.html # docs/reference/plot_RadialPlot.html # docs/reference/plot_Risoe.BINfileData.html # docs/reference/plot_ViolinPlot.html # docs/reference/read_BIN2R.html # docs/reference/read_Daybreak2R.html # docs/reference/read_PSL2R.html # docs/reference/read_RF2R.html # docs/reference/read_SPE2R.html # docs/reference/read_TIFF2R.html # docs/reference/read_XSYG2R.html # docs/reference/replicate_RLum.html # docs/reference/report_RLum.html # docs/reference/sTeve.html # docs/reference/scale_GammaDose.html # docs/reference/set_RLum.html # docs/reference/set_Risoe.BINfileData.html # docs/reference/smooth_RLum.html # docs/reference/structure_RLum.html # docs/reference/template_DRAC.html # docs/reference/tune_Data.html # docs/reference/use_DRAC.html # docs/reference/verify_SingleGrainData.html # docs/reference/write_R2BIN.html # docs/reference/write_R2TIFF.html # docs/reference/write_RLum2CSV.html # docs/sitemap.xml # inst/CITATION # man/Analyse_SAR.OSLdata.Rd # man/CW2pHMi.Rd # man/CW2pLM.Rd # man/CW2pLMi.Rd # man/CW2pPMi.Rd # man/GitHub-API.Rd # man/PSL2Risoe.BINfileData.Rd # man/RLum-class.Rd # man/RLum.Analysis-class.Rd # man/RLum.Data.Curve-class.Rd # man/RLum.Data.Image-class.Rd # man/RLum.Data.Spectrum-class.Rd # man/RLum.Results-class.Rd # man/Risoe.BINfileData-class.Rd # man/Risoe.BINfileData2RLum.Analysis.Rd # man/Second2Gray.Rd # man/analyse_Al2O3C_CrossTalk.Rd # man/analyse_Al2O3C_ITC.Rd # man/analyse_Al2O3C_Measurement.Rd # man/analyse_FadingMeasurement.Rd # man/analyse_IRSAR.RF.Rd # man/analyse_SAR.CWOSL.Rd # man/analyse_SAR.TL.Rd # man/analyse_baSAR.Rd # man/analyse_pIRIRSequence.Rd # man/analyse_portableOSL.Rd # man/apply_CosmicRayRemoval.Rd # man/apply_EfficiencyCorrection.Rd # man/bin_RLum.Data.Rd # man/calc_AliquotSize.Rd # man/calc_AverageDose.Rd # man/calc_CentralDose.Rd # man/calc_CobbleDoseRate.Rd # man/calc_CommonDose.Rd # man/calc_CosmicDoseRate.Rd # man/calc_FadingCorr.Rd # man/calc_FastRatio.Rd # man/calc_FiniteMixture.Rd # man/calc_FuchsLang2001.Rd # man/calc_HomogeneityTest.Rd # man/calc_Huntley2006.Rd # man/calc_IEU.Rd # man/calc_Kars2008.Rd # man/calc_Lamothe2003.Rd # man/calc_MaxDose.Rd # man/calc_MinDose.Rd # man/calc_OSLLxTxDecomposed.Rd # man/calc_OSLLxTxRatio.Rd # man/calc_SourceDoseRate.Rd # man/calc_Statistics.Rd # man/calc_TLLxTxRatio.Rd # man/calc_ThermalLifetime.Rd # man/calc_WodaFuchs2008.Rd # man/calc_gSGC.Rd # man/calc_gSGC_feldspar.Rd # man/combine_De_Dr.Rd # man/convert_Activity2Concentration.Rd # man/convert_BIN2CSV.Rd # man/convert_Concentration2DoseRate.Rd # man/convert_Daybreak2CSV.Rd # man/convert_PSL2CSV.Rd # man/convert_RLum2Risoe.BINfileData.Rd # man/convert_SG2MG.Rd # man/convert_Wavelength2Energy.Rd # man/convert_XSYG2CSV.Rd # man/extract_IrradiationTimes.Rd # man/extract_ROI.Rd # man/fit_CWCurve.Rd # man/fit_EmissionSpectra.Rd # man/fit_LMCurve.Rd # man/fit_OSLLifeTimes.Rd # man/fit_SurfaceExposure.Rd # man/fit_ThermalQuenching.Rd # man/get_Layout.Rd # man/get_Quote.Rd # man/get_RLum.Rd # man/get_Risoe.BINfileData.Rd # man/get_rightAnswer.Rd # man/length_RLum.Rd # man/merge_RLum.Analysis.Rd # man/merge_RLum.Data.Curve.Rd # man/merge_RLum.Rd # man/merge_RLum.Results.Rd # man/merge_Risoe.BINfileData.Rd # man/names_RLum.Rd # man/plot_AbanicoPlot.Rd # man/plot_DRCSummary.Rd # man/plot_DRTResults.Rd # man/plot_DetPlot.Rd # man/plot_FilterCombinations.Rd # man/plot_GrowthCurve.Rd # man/plot_Histogram.Rd # man/plot_KDE.Rd # man/plot_NRt.Rd # man/plot_OSLAgeSummary.Rd # man/plot_RLum.Analysis.Rd # man/plot_RLum.Data.Curve.Rd # man/plot_RLum.Data.Image.Rd # man/plot_RLum.Data.Spectrum.Rd # man/plot_RLum.Rd # man/plot_RLum.Results.Rd # man/plot_ROI.Rd # man/plot_RadialPlot.Rd # man/plot_Risoe.BINfileData.Rd # man/plot_ViolinPlot.Rd # man/read_BIN2R.Rd # man/read_Daybreak2R.Rd # man/read_PSL2R.Rd # man/read_RF2R.Rd # man/read_SPE2R.Rd # man/read_TIFF2R.Rd # man/read_XSYG2R.Rd # man/replicate_RLum.Rd # man/report_RLum.Rd # man/sTeve.Rd # man/scale_GammaDose.Rd # man/set_RLum.Rd # man/set_Risoe.BINfileData.Rd # man/smooth_RLum.Rd # man/structure_RLum.Rd # man/template_DRAC.Rd # man/tune_Data.Rd # man/use_DRAC.Rd # man/verify_SingleGrainData.Rd # man/write_R2BIN.Rd # man/write_R2TIFF.Rd # man/write_RLum2CSV.Rd
2 parents 0752217 + 3350a29 commit 3960f00

File tree

363 files changed

+4859
-16295
lines changed

Some content is hidden

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

363 files changed

+4859
-16295
lines changed

.github/workflows/GitHub_Actions_CI.yaml

+42-76
Original file line numberDiff line numberDiff line change
@@ -10,112 +10,78 @@ name: GitHub Actions CI
1010

1111
## change if caches needs to be refreshed
1212
env:
13-
cache-version: v1
13+
cache-version: v3
1414

1515
jobs:
1616
R-CMD-check:
1717
runs-on: ${{ matrix.config.os }}
18+
1819
name: ${{ matrix.config.os }} (${{ matrix.config.r }})
20+
1921
strategy:
2022
fail-fast: false
2123
matrix:
2224
config:
23-
- {os: windows-latest, r: 'release', not_cran: 'true', rspm: "https://packagemanager.rstudio.com/all/latest"}
24-
- {os: macos-11, r: 'release', not_cran: 'true', rspm: "https://packagemanager.rstudio.com/all/latest"}
25-
- {os: macos-10.15, r: 'oldrel', not_cran: 'true', rspm: "https://packagemanager.rstudio.com/all/latest"}
26-
- {os: ubuntu-20.04, r: 'devel', not_cran: 'true', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
27-
- {os: ubuntu-20.04, r: 'release', not_cran: 'true', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
28-
- {os: ubuntu-20.04, r: 'oldrel', not_cran: 'true', rspm: "https://packagemanager.rstudio.com/cran/__linux__/focal/latest"}
25+
- {os: windows-latest, r: 'oldrel', not_cran: 'true'}
26+
- {os: windows-latest, r: 'release', not_cran: 'true'}
27+
- {os: windows-latest, r: 'devel', not_cran: 'true'}
28+
# - {os: windows-2019, r: 'oldrel', not_cran: 'true'}
29+
- {os: macos-12, r: 'release', not_cran: 'true'}
30+
#- {os: macos-11, r: 'oldrel', not_cran: 'true'}
31+
- {os: ubuntu-latest, r: 'devel', not_cran: 'true'}
32+
- {os: ubuntu-latest, r: 'release', not_cran: 'true'} #OK
33+
- {os: ubuntu-latest, r: 'oldrel', not_cran: 'true'}
2934
env:
30-
R_REMOTES_NO_ERRORS_FROM_WARNINGS: false
31-
RSPM: ${{ matrix.config.rspm }}
3235
_R_CHECK_FORCE_SUGGESTS_: true
3336
GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
3437

3538
steps:
36-
- uses: actions/checkout@v2
37-
38-
- uses: r-lib/actions/setup-r@v1
39-
with:
40-
r-version: ${{ matrix.config.r }}
41-
http-user-agent: ${{ matrix.config.http-user-agent }}
42-
43-
- uses: r-lib/actions/setup-pandoc@v1
39+
- if: runner.os == 'macOS'
40+
run: brew install jags curl
4441

45-
- name: Install remotes
42+
- name: Install JAGS on Windows (R release)
43+
if: (runner.os == 'windows') && (matrix.config.r != 'oldrel')
4644
run: |
47-
install.packages('remotes')
48-
saveRDS(remotes::dev_package_deps(dependencies = TRUE), "depends.Rds", version = 2)
49-
shell: Rscript {0}
45+
curl --progress-bar -s -o 'C:\JAGS-4.3.1.exe' -L 'https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Windows/JAGS-4.3.1.exe'
46+
C:\JAGS-4.3.1.exe /S
5047
51-
- name: Cache R packages
52-
if: runner.os != 'Windows'
53-
uses: actions/cache@v1
54-
with:
55-
path: ${{ env.R_LIBS_USER }}
56-
key: ${{ env.cache-version }}-${{ runner.os }}-r-${{ matrix.config.r }}-${{ hashFiles('depends.Rds') }}
57-
restore-keys: ${{ env.cache-version }}-${{ runner.os }}-r-${{ matrix.config.r }}-
58-
59-
- name: Install system dependencies
60-
if: runner.os == 'Linux'
48+
- name: Install JAGS on Windows (R oldrel)
49+
if: (runner.os == 'windows') && (matrix.config.r == 'oldrel')
6150
run: |
62-
while read -r cmd
63-
do
64-
eval sudo $cmd
65-
done < <(Rscript -e 'writeLines(remotes::system_requirements("ubuntu", "20.04"))')
51+
curl --progress-bar -s -o 'C:\JAGS-4.3.0.exe' -L 'https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Windows/JAGS-4.3.0.exe'
52+
C:\JAGS-4.3.0.exe /S
6653
67-
- name: Install ghostscript (Linux)
68-
if: runner.os == 'Linux'
69-
run: |
70-
sudo apt-get install -y ghostscript
71-
sudo apt-get install -y curl
54+
- uses: actions/checkout@v2
7255

73-
- name: Install jags (macOS)
74-
if: runner.os == 'macOS'
75-
run: brew install jags curl
56+
- uses: r-lib/actions/setup-pandoc@v2
7657

77-
- name: Install jags (Windows)
78-
if: runner.os == 'windows'
79-
run: |
80-
curl --progress-bar -s -o 'C:\JAGS-4.3.1.exe' -L 'https://sourceforge.net/projects/mcmc-jags/files/JAGS/4.x/Windows/JAGS-4.3.1.exe'
81-
C:\JAGS-4.3.1.exe /S
58+
- uses: r-lib/actions/setup-r@v2
59+
with:
60+
r-version: ${{ matrix.config.r }}
61+
http-user-agent: ${{ matrix.config.http-user-agent }}
62+
use-public-rspm: true
8263

83-
- name: Install dependencies
84-
run: |
85-
remotes::install_deps(dependencies = TRUE)
86-
remotes::install_cran("rcmdcheck")
87-
remotes::install_cran("covr")
88-
shell: Rscript {0}
64+
- uses: r-lib/actions/setup-r-dependencies@v2
65+
with:
66+
extra-packages: |
67+
any::rcmdcheck
68+
any::XML
69+
any::covr
70+
needs: check
8971

90-
- name: Show session info
72+
- name: Show session info before test
9173
run: |
92-
options(width = 100)
93-
pkgs <- installed.packages()[, "Package"]
94-
sessioninfo::session_info(pkgs, include_base = TRUE)
74+
print(utils::sessionInfo())
9575
shell: Rscript {0}
9676

97-
- name: Remove depends.Rds
77+
- name: Show session curl info
9878
run: |
99-
unlink("depends.Rds")
79+
print(curl::curl_version())
10080
shell: Rscript {0}
10181

102-
- name: Check package
103-
env:
104-
_R_CHECK_CRAN_INCOMING_: false
105-
run: rcmdcheck::rcmdcheck(args = c("--no-manual", "--as-cran"), error_on = "warning", check_dir = "check")
106-
shell: Rscript {0}
107-
108-
- name: Show testthat output
109-
if: always()
110-
run: find check -name 'testthat.Rout*' -exec cat '{}' \; || true
111-
shell: bash
112-
113-
- name: Upload check results
114-
if: failure()
115-
uses: actions/upload-artifact@main
82+
- uses: r-lib/actions/check-r-package@v2
11683
with:
117-
name: ${{ runner.os }}-r${{ matrix.config.r }}-results
118-
path: check
84+
upload-snapshots: true
11985

12086
- name: Test coverage
12187
run: |

.zenodo.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@
1616
"resource_type": "software"
1717
}
1818
],
19-
"version": "0.9.20",
19+
"version": "0.9.21",
2020
"upload_type": "software",
2121
"keywords": ["Luminescence", "Luminescence dating", "Chronology", "Age models"],
22-
"publication_date": "2022-07-14",
22+
"publication_date": "2023-02-03",
2323
"creators": [
2424
{
2525
"orcid": "0000-0002-0734-2199",

DESCRIPTION

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Package: Luminescence
22
Type: Package
33
Title: Comprehensive Luminescence Dating Data Analysis
4-
Version: 0.9.20
5-
Date: 2022-07-14
4+
Version: 0.9.21
5+
Date: 2023-02-03
66
Author: Sebastian Kreutzer [aut, trl, cre, dtc] (<https://orcid.org/0000-0002-0734-2199>),
77
Christoph Burow [aut, trl, dtc] (<https://orcid.org/0000-0002-5023-4046>),
88
Michael Dietze [aut] (<https://orcid.org/0000-0001-6063-1726>),
@@ -59,36 +59,36 @@ BugReports: https://github.com/R-Lum/Luminescence/issues
5959
Depends:
6060
R (>= 4.1),
6161
utils
62-
LinkingTo: Rcpp (>= 1.0.9),
63-
RcppArmadillo (>= 0.11.2.0.0)
62+
LinkingTo: Rcpp (>= 1.0.10),
63+
RcppArmadillo (>= 0.11.4.0.0)
6464
Imports:
6565
bbmle (>= 1.0.25),
66-
data.table (>= 1.14.2),
67-
DEoptim (>= 2.2-6),
68-
httr (>= 1.4.3),
66+
data.table (>= 1.14.6),
67+
DEoptim (>= 2.2-8),
68+
httr (>= 1.4.4),
6969
lamW (>= 2.1.1),
70-
matrixStats (>= 0.62.0),
70+
matrixStats (>= 0.63.0),
7171
methods,
72-
minpack.lm (>= 1.2-2),
73-
mclust (>= 5.4.10),
72+
minpack.lm (>= 1.2-3),
73+
mclust (>= 6.0.0),
7474
plotrix (>= 3.8-2),
75-
readxl (>= 1.4.0),
76-
Rcpp (>= 1.0.9),
75+
readxl (>= 1.4.1),
76+
Rcpp (>= 1.0.10),
7777
shape (>= 1.4.6),
7878
parallel,
7979
XML (>= 3.99),
8080
zoo (>= 1.8)
8181
Suggests:
8282
spelling (>= 2.2),
8383
plotly (>= 4.10.0),
84-
rmarkdown (>= 2.14),
85-
rstudioapi (>= 0.13),
84+
rmarkdown (>= 2.20),
85+
rstudioapi (>= 0.14),
8686
rjags (>= 4-13),
8787
coda (>= 0.19-4),
8888
pander (>= 0.6.5),
89-
testthat (>= 3.1.4),
89+
testthat (>= 3.1.6),
9090
tiff (>= 0.1-11),
91-
devtools (>= 2.4.3),
91+
devtools (>= 2.4.5),
9292
R.rsp (>= 0.45.0)
9393
VignetteBuilder: R.rsp
9494
URL: https://CRAN.R-project.org/package=Luminescence
@@ -233,4 +233,4 @@ Collate:
233233
'write_R2TIFF.R'
234234
'write_RLum2CSV.R'
235235
'zzz.R'
236-
RoxygenNote: 7.2.0
236+
RoxygenNote: 7.2.3

Luminescence.BuildResults/Luminescence-Ex.timings.0.9.21.WARNING

Whitespace-only changes.

0 commit comments

Comments
 (0)