Merge branch 'develop'

* develop: (47 commits)
  Bump build number
  Fix compatibility with Moneydance 2023.3 (5063)
  lazily create OnlineService because it needs a non-null AccountBook in 2023.2 and up
  Update dependency com.mebigfatguy.sb-contrib:sb-contrib to v7.6.2
  Update dependency commons-logging:commons-logging to v1.3.0
  Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v5.2.5
  Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v5.2.4
  Update dependency com.mebigfatguy.sb-contrib:sb-contrib to v7.6.1
  Update dependency com.guardsquare:proguard-gradle to v7.4.1
  Update dependency org.apache.commons:commons-lang3 to v3.14.0
  Update dependency checkstyle to v10.12.5
  Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v5.2.3
  Update dependency org.checkerframework:checker to v3.40.0
  Update dependency org.apache.commons:commons-text to v1.11.0
  Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v5.2.1
  Update dependency jacoco to v0.8.11
  Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v5.2.0
  Update dependency com.github.spotbugs.snom:spotbugs-gradle-plugin to v5.1.5
  Update dependency com.guardsquare:proguard-gradle to v7.4.0
  Update dependency gradle to v7.6.3
  ...

CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com),
 and this project does *not* adhere to Semantic Versioning.
 
+## [v11] - 2023-12-02
+### Fixed
+- Compatibility with Moneydance 2023.3 ([#20]).
+
+
 ## [v10] - 2022-12-27
 ### Fixed
 - Exclude authorizations when downloading transactions ([#18]).
@@ -91,6 +96,7 @@ and this project does *not* adhere to Semantic Versioning.
 - Compatibility with Java 1.3 and later versions.
 
 
+[#20]: https://github.com/my-flow/paypalimporter/pull/20
 [#18]: https://github.com/my-flow/paypalimporter/issues/18
 [#15]: https://github.com/my-flow/paypalimporter/issues/15
 [#13]: https://github.com/my-flow/paypalimporter/issues/13
@@ -109,3 +115,4 @@ and this project does *not* adhere to Semantic Versioning.
 [v8]: https://github.com/my-flow/paypalimporter/compare/v7...v8
 [v9]: https://github.com/my-flow/paypalimporter/compare/v8...v9
 [v10]: https://github.com/my-flow/paypalimporter/compare/v9...v10
+[v11]: https://github.com/my-flow/paypalimporter/compare/v10...v11

build.gradle

@@ -13,8 +13,8 @@ buildscript {
     dependencies {
         classpath 'gradle.plugin.com.github.johnrengelman:shadow:7.1.2'
         classpath 'commons-configuration:commons-configuration:1.10'
-        classpath 'com.guardsquare:proguard-gradle:7.3.0'
-        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.0.13'
+        classpath 'com.guardsquare:proguard-gradle:7.4.1'
+        classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:5.2.5'
         classpath 'org.sonarsource.scanner.gradle:sonarqube-gradle-plugin:3.5.0.2730'
     }
 }
@@ -59,7 +59,7 @@ subprojects {
 	}
 
     jacoco {
-        toolVersion = "0.8.8"
+        toolVersion = "0.8.11"
     }
 
     tasks.withType(Checkstyle) {
@@ -71,11 +71,11 @@ subprojects {
     }
 
 	checkstyle {
-		toolVersion = "10.5.0"
+		toolVersion = "10.12.5"
 	}
 
 	pmd {
-        toolVersion = "6.52.0"
+        toolVersion = "6.55.0"
         sourceSets = [sourceSets.main]
         ruleSets = []
         ruleSetFiles = files("$rootDir/config/pmd-ruleSet.xml")

config/spotbugs-exclude.xml

@@ -9,6 +9,7 @@
         <Or>
             <Bug pattern="EI_EXPOSE_REP"/>
             <Bug pattern="EI_EXPOSE_REP2"/>
+            <Bug pattern="ENMI_ONE_ENUM_VALUE"/>
             <Bug pattern="EXS_EXCEPTION_SOFTENING_NO_CONSTRAINTS"/>
             <Bug pattern="FCCD_FIND_CLASS_CIRCULAR_DEPENDENCY"/>
             <Bug pattern="FII_USE_METHOD_REFERENCE"/>

core/build.gradle

@@ -7,8 +7,8 @@ apply plugin: 'com.github.johnrengelman.shadow'
 
 dependencies {
     api(':moneydance:1358')
-    api('com.google.dagger:dagger:2.44.2')
-    annotationProcessor('com.google.dagger:dagger-compiler:2.44.2')
+    api('com.google.dagger:dagger:2.48.1')
+    annotationProcessor('com.google.dagger:dagger-compiler:2.48.1')
     api(':paypal-core-paypalimporter:1.7.2')
     api('com.paypal.sdk:merchantsdk:2.15.122') {
         exclude group: 'com.paypal.sdk', module: 'paypal-core'
@@ -19,14 +19,14 @@ dependencies {
     api('com.jgoodies:jgoodies-validation:2.5.1') {
         exclude group: 'com.jgoodies', module: 'jgoodies-common'
     }
-    api('org.apache.commons:commons-lang3:3.12.0')
+    api('org.apache.commons:commons-lang3:3.14.0')
     api('commons-configuration:commons-configuration:1.10')
-    api('org.apache.commons:commons-text:1.10.0')
-    api('org.slf4j:slf4j-api:2.0.6')
-    api('org.checkerframework:checker:3.28.0')
+    api('org.apache.commons:commons-text:1.11.0')
+    api('org.slf4j:slf4j-api:2.0.9')
+    api('org.checkerframework:checker:3.40.0')
     api('com.google.code.findbugs:jsr305:3.0.2')
 
-    spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.4.7'
+    spotbugsPlugins 'com.mebigfatguy.sb-contrib:sb-contrib:7.6.2'
 }
 
 jar {
@@ -53,20 +53,20 @@ shadowJar {
 
     dependencies {
         include dependency('javax.inject:javax.inject:1')
-        include dependency('com.google.dagger:dagger:2.44.2')
+        include dependency('com.google.dagger:dagger:2.48.1')
         include dependency('commons-configuration:commons-configuration:1.10')
         include dependency('commons-lang:commons-lang:2.6')
-        include dependency('org.apache.commons:commons-lang3:3.12.0')
-        include dependency('org.apache.commons:commons-text:1.10.0')
+        include dependency('org.apache.commons:commons-lang3:3.14.0')
+        include dependency('org.apache.commons:commons-text:1.11.0')
         include dependency('net.jcip:jcip-annotations:1.0')
         include dependency(':jgoodies-common:1.9.0')
         include dependency(':jgoodies-forms:1.10')
         include dependency('com.jgoodies:jgoodies-validation:2.5.1')
-        include dependency('commons-logging:commons-logging:1.2')
+        include dependency('commons-logging:commons-logging:1.3.0')
         include dependency('com.paypal.sdk:merchantsdk:2.15.122')
         include dependency(':paypal-core-paypalimporter:1.7.2')
-        include dependency('org.slf4j:slf4j-api:2.0.6')
-        include dependency('org.slf4j:slf4j-nop:2.0.6')
+        include dependency('org.slf4j:slf4j-api:2.0.9')
+        include dependency('org.slf4j:slf4j-nop:2.0.9')
     }
     relocate 'com.jgoodies', 'com.moneydance.modules.features.paypalimporter.jgoodies'
 }

core/src/main/java/com/moneydance/modules/features/paypalimporter/controller/TransactionSearchRequestHandler.java

@@ -103,7 +103,7 @@ private OnlineTxn createNewOnlineTxn(
 
         final String transactionID = result.getTransactionID();
         String grossAmount = "0";
-        CurrencyCodeType currencyID = null;
+        CurrencyCodeType currencyID = CurrencyCodeType.CUSTOMCODE;
         if (result.getGrossAmount() != null) {
             grossAmount = result.getGrossAmount().getValue();
             currencyID = result.getGrossAmount().getCurrencyID();

core/src/main/java/com/moneydance/modules/features/paypalimporter/integration/OnlineServiceFactory.java

@@ -2,9 +2,9 @@
 
 import com.infinitekind.moneydance.model.OnlineInfo;
 import com.infinitekind.moneydance.model.OnlineService;
+import com.infinitekind.util.StreamTable;
 import com.moneydance.modules.features.paypalimporter.model.IAccountBook;
 import com.moneydance.modules.features.paypalimporter.util.Settings;
-import com.moneydance.util.StreamTable;
 
 import javax.annotation.Nullable;
 import java.util.Date;
@@ -23,17 +23,24 @@ public final class OnlineServiceFactory {
             OnlineServiceFactory.class.getName());
 
     private final Settings settings;
-    private final OnlineService initializedOnlineService;
+    private OnlineService initializedOnlineService;
 
     public OnlineServiceFactory(final Settings argSettings) {
         this.settings = argSettings;
-        this.initializedOnlineService = createService();
     }
 
     public PayPalOnlineService createService(
             final IAccountBook accountBook) {
         final OnlineInfo onlineInfo = accountBook.getOnlineInfo();
 
+        if (this.initializedOnlineService == null) {
+            this.initializedOnlineService = new InitializedOnlineService(
+                    accountBook.getWrappedOriginal(),
+                    new StreamTable(),
+                    this.settings,
+                    new Date());
+        }
+
         OnlineService onlineService = getServiceById(onlineInfo, initializedOnlineService);
 
         if (onlineService == null) {
@@ -63,14 +70,6 @@ public void removeService(final IAccountBook accountBook) {
         }
     }
 
-    private OnlineService createService() {
-        return new InitializedOnlineService(
-                null, // temporary account
-                new StreamTable(),
-                this.settings,
-                new Date());
-    }
-
     @Nullable private static OnlineService getServiceById(
             final OnlineInfo onlineInfo, final OnlineService service) {
 

core/src/main/resources/com/moneydance/modules/features/paypalimporter/meta_info.dict

@@ -1,6 +1,6 @@
 {
   "vendor" = "Florian J. Breunig"
-  "module_build" = "10"
+  "module_build" = "11"
   "minbuild" = "1000"
   "vendor.url" = "https://www.my-flow.com/paypalimporter/"
   "module_name" = "PayPal Importer"

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.3-bin.zip
 networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

renovate.json

@@ -1,9 +1,10 @@
 {
   "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "ignoreTests": true,
   "baseBranches": ["develop"],
   "packageRules": [
     {
-      "matchUpdateTypes": ["patch", "pin", "digest"],
+      "matchUpdateTypes": ["minor", "patch", "pin", "digest"],
       "automerge": true
     }
   ]

support/build.gradle

@@ -2,14 +2,14 @@ apply plugin: 'application'
 
 dependencies {
     api project(':core')
-    annotationProcessor "com.google.dagger:dagger-compiler:2.44.2"
+    annotationProcessor "com.google.dagger:dagger-compiler:2.48.1"
 
-    testRuntimeOnly('org.slf4j:slf4j-simple:2.0.6')
+    testRuntimeOnly('org.slf4j:slf4j-simple:2.0.9')
     testRuntimeOnly('com.syncthemall:dropbox-java-sdk:1.5.3.2')
 
     testImplementation('junit:junit:4.13.2')
 
-    testRuntimeOnly('org.slf4j:slf4j-simple:2.0.6')
+    testRuntimeOnly('org.slf4j:slf4j-simple:2.0.9')
 }
 
 mainClassName = 'com.moneydance.modules.features.paypalimporter.ConsoleRunner'