Skip to content

Commit

Permalink
Upgrade to 3.9.4
Browse files Browse the repository at this point in the history
  • Loading branch information
carlosaparadam committed Oct 30, 2023
1 parent 797fb79 commit 7696144
Show file tree
Hide file tree
Showing 20 changed files with 128 additions and 148 deletions.
3 changes: 2 additions & 1 deletion .classpath
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@
<attribute name="gradle_used_by_scope" value="main,test"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8/"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-11/"/>
<classpathentry kind="con" path="org.eclipse.buildship.core.gradleclasspathcontainer"/>
<classpathentry combineaccessrules="false" kind="src" path="/adempiere"/>
<classpathentry kind="output" path="bin/default"/>
</classpath>
16 changes: 1 addition & 15 deletions .github/workflows/build_with_gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,21 +26,7 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'adopt-hotspot'
java-version: 8

- name: get adempiere source
run: |
download_repo="https://github.com/erpcya/adempiere/releases/download/3.9.3-rs-4.3/Adempiere_393LTS.tar.gz"
wget $download_repo -c -O Adempiere.tar.gz
- name: uncompress file
run: tar -xzf Adempiere.tar.gz
- name: create dependences folder
run: mkdir dependences
- name: move dependences
run: mv Adempiere/lib/*.jar dependences/
- name: move packages
run: mv Adempiere/packages/*/lib/*.jar dependences/
java-version: 11

- name: Build with Gradle
run: gradle build
Expand Down
17 changes: 2 additions & 15 deletions .github/workflows/publish_with_gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,26 +25,13 @@ jobs:
uses: actions/setup-java@v2
with:
distribution: 'adopt-hotspot'
java-version: 8

- name: get adempiere source
run: |
download_repo="https://github.com/erpcya/adempiere/releases/download/3.9.3-rs-4.3/Adempiere_393LTS.tar.gz"
wget $download_repo -c -O Adempiere.tar.gz
- name: uncompress file
run: tar -xzf Adempiere.tar.gz
- name: create dependences folder
run: mkdir dependences
- name: move dependences
run: mv Adempiere/lib/*.jar dependences/
- name: move packages
run: mv Adempiere/packages/*/lib/*.jar dependences/
java-version: 11

- name: Publish with Gradle
run: gradle publish
env:
ADEMPIERE_LIBRARY_VERSION: ${{ github.event.release.tag_name }}
ADEMPIERE_LIBRARY_GROUP: ${{ secrets.ADEMPIERE_LIBRARY_GROUP }}
ORG_GRADLE_PROJECT_signingKey: ${{ secrets.PGP_SECRET }}
ORG_GRADLE_PROJECT_signingPassword: ${{ secrets.PGP_PASSPHRASE }}
ORG_GRADLE_PROJECT_sonatypePassword: ${{ secrets.OSSRH_TOKEN }}
Expand Down
6 changes: 3 additions & 3 deletions .settings/org.eclipse.jdt.core.prefs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
org.eclipse.jdt.core.compiler.codegen.methodParameters=do not generate
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
org.eclipse.jdt.core.compiler.codegen.targetPlatform=11
org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.compliance=11
org.eclipse.jdt.core.compiler.debug.lineNumber=generate
org.eclipse.jdt.core.compiler.debug.localVariable=generate
org.eclipse.jdt.core.compiler.debug.sourceFile=generate
Expand All @@ -12,4 +12,4 @@ org.eclipse.jdt.core.compiler.problem.enablePreviewFeatures=disabled
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
org.eclipse.jdt.core.compiler.problem.reportPreviewFeatures=warning
org.eclipse.jdt.core.compiler.release=disabled
org.eclipse.jdt.core.compiler.source=1.8
org.eclipse.jdt.core.compiler.source=11
28 changes: 17 additions & 11 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,30 @@ apply plugin: 'java-library'
apply plugin: 'maven-publish'
apply plugin: 'signing'

sourceCompatibility = 1.8
targetCompatibility = 1.8

repositories {
mavenLocal()
mavenCentral()
}

if (JavaVersion.current().isJava8Compatible()) {
allprojects {
tasks.withType(Javadoc) {
options.addStringOption('Xdoclint:none', '-quiet')
}
}
//Solution by the second link
allprojects {
tasks.withType(Javadoc).all { enabled = false }
}

sourceCompatibility = 1.11
def baseVersion = '3.9.4'
def baseGroupId = 'io.github.adempiere'
def customGroupId = System.getenv("ADEMPIERE_LIBRARY_GROUP")

dependencies {
compileOnly fileTree(dir: 'dependences', include: ['*.jar'])
api fileTree(
dir: 'lib',
include: [
'*.jar'
]
)
// ADempiere Core
api "${baseGroupId}:base:${baseVersion}"
}

sourceSets {
Expand Down Expand Up @@ -58,7 +64,7 @@ publishing {
}
publications {
mavenJava(MavenPublication) {
groupId 'io.github.adempiere'
groupId customGroupId
artifactId 'withholding-engine'
version
from components.java
Expand Down
12 changes: 6 additions & 6 deletions src/main/java/org/spin/model/I_WH_Definition.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public interface I_WH_Definition
*/
public int getC_BPartner_ID();

public org.compiere.model.I_C_BPartner getC_BPartner() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_BPartner getC_BPartner() throws RuntimeException;

/** Column name C_Charge_ID */
public static final String COLUMNNAME_C_Charge_ID = "C_Charge_ID";
Expand All @@ -91,7 +91,7 @@ public interface I_WH_Definition
*/
public int getC_Charge_ID();

public org.compiere.model.I_C_Charge getC_Charge() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_Charge getC_Charge() throws RuntimeException;

/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
Expand Down Expand Up @@ -122,7 +122,7 @@ public interface I_WH_Definition
*/
public int getDeclarationCreditDocType_ID();

public org.compiere.model.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;

/** Column name DeclarationDebitDocType_ID */
public static final String COLUMNNAME_DeclarationDebitDocType_ID = "DeclarationDebitDocType_ID";
Expand All @@ -137,7 +137,7 @@ public interface I_WH_Definition
*/
public int getDeclarationDebitDocType_ID();

public org.compiere.model.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;

/** Column name Description */
public static final String COLUMNNAME_Description = "Description";
Expand Down Expand Up @@ -248,7 +248,7 @@ public interface I_WH_Definition
*/
public int getWithholdingCreditDocType_ID();

public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;

/** Column name WithholdingDebitDocType_ID */
public static final String COLUMNNAME_WithholdingDebitDocType_ID = "WithholdingDebitDocType_ID";
Expand All @@ -263,5 +263,5 @@ public interface I_WH_Definition
*/
public int getWithholdingDebitDocType_ID();

public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
}
2 changes: 1 addition & 1 deletion src/main/java/org/spin/model/I_WH_DefinitionLine.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public interface I_WH_DefinitionLine
*/
public int getC_DocType_ID();

public org.compiere.model.I_C_DocType getC_DocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getC_DocType() throws RuntimeException;

/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/spin/model/I_WH_Log.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public interface I_WH_Log
*/
public int getC_Invoice_ID();

public org.compiere.model.I_C_Invoice getC_Invoice() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_Invoice getC_Invoice() throws RuntimeException;

/** Column name C_InvoiceLine_ID */
public static final String COLUMNNAME_C_InvoiceLine_ID = "C_InvoiceLine_ID";
Expand All @@ -91,7 +91,7 @@ public interface I_WH_Log
*/
public int getC_InvoiceLine_ID();

public org.compiere.model.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_InvoiceLine getC_InvoiceLine() throws RuntimeException;

/** Column name Comments */
public static final String COLUMNNAME_Comments = "Comments";
Expand Down Expand Up @@ -144,7 +144,7 @@ public interface I_WH_Log
/** Get Source Invoice */
public int getSourceInvoice_ID();

public org.compiere.model.I_C_Invoice getSourceInvoice() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_Invoice getSourceInvoice() throws RuntimeException;

/** Column name SourceInvoiceLine_ID */
public static final String COLUMNNAME_SourceInvoiceLine_ID = "SourceInvoiceLine_ID";
Expand All @@ -155,7 +155,7 @@ public interface I_WH_Log
/** Get Source Invoice Line */
public int getSourceInvoiceLine_ID();

public org.compiere.model.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_InvoiceLine getSourceInvoiceLine() throws RuntimeException;

/** Column name Updated */
public static final String COLUMNNAME_Updated = "Updated";
Expand Down
8 changes: 4 additions & 4 deletions src/main/java/org/spin/model/I_WH_Setting.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public interface I_WH_Setting
*/
public int getAD_Table_ID();

public org.compiere.model.I_AD_Table getAD_Table() throws RuntimeException;
public org.adempiere.core.domains.models.I_AD_Table getAD_Table() throws RuntimeException;

/** Column name C_Charge_ID */
public static final String COLUMNNAME_C_Charge_ID = "C_Charge_ID";
Expand All @@ -91,7 +91,7 @@ public interface I_WH_Setting
*/
public int getC_Charge_ID();

public org.compiere.model.I_C_Charge getC_Charge() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_Charge getC_Charge() throws RuntimeException;

/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
Expand Down Expand Up @@ -281,7 +281,7 @@ public interface I_WH_Setting
*/
public int getWithholdingCreditDocType_ID();

public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;

/** Column name WithholdingDebitDocType_ID */
public static final String COLUMNNAME_WithholdingDebitDocType_ID = "WithholdingDebitDocType_ID";
Expand All @@ -296,5 +296,5 @@ public interface I_WH_Setting
*/
public int getWithholdingDebitDocType_ID();

public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
}
10 changes: 5 additions & 5 deletions src/main/java/org/spin/model/I_WH_Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ public interface I_WH_Type
*/
public int getAD_View_ID();

public org.adempiere.model.I_AD_View getAD_View() throws RuntimeException;
public org.adempiere.core.domains.models.I_AD_View getAD_View() throws RuntimeException;

/** Column name Created */
public static final String COLUMNNAME_Created = "Created";
Expand Down Expand Up @@ -107,7 +107,7 @@ public interface I_WH_Type
*/
public int getDeclarationCreditDocType_ID();

public org.compiere.model.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getDeclarationCreditDocType() throws RuntimeException;

/** Column name DeclarationDebitDocType_ID */
public static final String COLUMNNAME_DeclarationDebitDocType_ID = "DeclarationDebitDocType_ID";
Expand All @@ -122,7 +122,7 @@ public interface I_WH_Type
*/
public int getDeclarationDebitDocType_ID();

public org.compiere.model.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getDeclarationDebitDocType() throws RuntimeException;

/** Column name Description */
public static final String COLUMNNAME_Description = "Description";
Expand Down Expand Up @@ -231,7 +231,7 @@ public interface I_WH_Type
*/
public int getWithholdingCreditDocType_ID();

public org.compiere.model.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getWithholdingCreditDocType() throws RuntimeException;

/** Column name WithholdingDebitDocType_ID */
public static final String COLUMNNAME_WithholdingDebitDocType_ID = "WithholdingDebitDocType_ID";
Expand All @@ -246,5 +246,5 @@ public interface I_WH_Type
*/
public int getWithholdingDebitDocType_ID();

public org.compiere.model.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
public org.adempiere.core.domains.models.I_C_DocType getWithholdingDebitDocType() throws RuntimeException;
}
Loading

0 comments on commit 7696144

Please sign in to comment.