Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge with JGAAP Repo #130

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
61 changes: 0 additions & 61 deletions .classpath

This file was deleted.

105 changes: 105 additions & 0 deletions .github/workflows/jpackage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
name: Package JGAAP

on:
push:
branches: [ "gradle" ]
pull_request:
types:
- closed

jobs:
build-windows-installer:
name: Build Installer on Windows
runs-on: windows-latest
steps:

# SETUP BUILD ENVIRONMENT
- id: checkout-code
name: Checkout code
uses: actions/checkout@v4
- id: setup-jdk
name: Setup JDK
uses: actions/setup-java@v4
with:
java-package: jdk+fx
architecture: x64
distribution: 'zulu'
java-version: '21'

# BUILD FOR DISTRIBUTION
- id: build
name: Build distribution
run: ./gradlew jpackage

# SAVE INSTALLER
- id: upload-installer
name: Upload installer
uses: actions/upload-artifact@v4
with:
path: ./jgaap/build/jpackage/JGAAP-9.0.0.msi
name: windows-installer
retention-days: 1

build-macos-intel-installer:
name: Build Installer on macOS intel
runs-on: macos-13
steps:

# SETUP BUILD ENVIRONMENT
- id: checkout-code
name: Checkout code
uses: actions/checkout@v4
- id: setup-jdk
name: Setup JDK
uses: actions/setup-java@v4
with:
java-package: jdk+fx
architecture: x64
distribution: 'zulu'
java-version: '21'

# BUILD FOR DISTRIBUTION
- id: build
name: Build distribution
run: ./gradlew jpackage

# SAVE INSTALLER
- id: upload-installer
name: Upload installer
uses: actions/upload-artifact@v4
with:
path: ./jgaap/build/jpackage/JGAAP-x86_64-9.0.0.dmg
name: macOS-dmg-Intel
retention-days: 1

build-macos-AS-installer:
name: Build Installer on macOS ARM
runs-on: macos-latest
steps:

# SETUP BUILD ENVIRONMENT
- id: checkout-code
name: Checkout code
uses: actions/checkout@v4
- id: setup-jdk
name: Setup JDK
uses: actions/setup-java@v4
with:
java-package: jdk+fx
architecture: aarch64
distribution: 'zulu'
java-version: '21'

# BUILD FOR DISTRIBUTION
- id: build
name: Build distribution
run: ./gradlew jpackage

# SAVE INSTALLER
- id: upload-installer
name: Upload installer
uses: actions/upload-artifact@v4
with:
path: ./jgaap/build/jpackage/JGAAP-aarch64-9.0.0.dmg
name: macOS-dmg-AS
retention-days: 1
9 changes: 3 additions & 6 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
bin/*
.DS_Store
/bin/
src/unittest_logs
.vscode
.project
JGGAP.jar
/build
/bin
/jgaap/build
Binary file added .gradle/8.8/checksums/checksums.lock
Binary file not shown.
Binary file added .gradle/8.8/checksums/md5-checksums.bin
Binary file not shown.
Binary file added .gradle/8.8/checksums/sha1-checksums.bin
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
�zcrgwh7oinbb5b7xzhj3sxxsiy��8����.<o�+$����classes� �'6XI�Ј��sources\:����,�E s!{�B
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
package org.gradle.accessors.dm;

import org.gradle.api.NonNullApi;
import org.gradle.api.artifacts.MinimalExternalModuleDependency;
import org.gradle.plugin.use.PluginDependency;
import org.gradle.api.artifacts.ExternalModuleDependencyBundle;
import org.gradle.api.artifacts.MutableVersionConstraint;
import org.gradle.api.provider.Provider;
import org.gradle.api.model.ObjectFactory;
import org.gradle.api.provider.ProviderFactory;
import org.gradle.api.internal.catalog.AbstractExternalDependencyFactory;
import org.gradle.api.internal.catalog.DefaultVersionCatalog;
import java.util.Map;
import org.gradle.api.internal.attributes.ImmutableAttributesFactory;
import org.gradle.api.internal.artifacts.dsl.CapabilityNotationParser;
import javax.inject.Inject;

/**
* A catalog of dependencies accessible via the {@code libs} extension.
*/
@NonNullApi
public class LibrariesForLibs extends AbstractExternalDependencyFactory {

private final AbstractExternalDependencyFactory owner = this;
private final JunitLibraryAccessors laccForJunitLibraryAccessors = new JunitLibraryAccessors(owner);
private final VersionAccessors vaccForVersionAccessors = new VersionAccessors(providers, config);
private final BundleAccessors baccForBundleAccessors = new BundleAccessors(objects, providers, config, attributesFactory, capabilityNotationParser);
private final PluginAccessors paccForPluginAccessors = new PluginAccessors(providers, config);

@Inject
public LibrariesForLibs(DefaultVersionCatalog config, ProviderFactory providers, ObjectFactory objects, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) {
super(config, providers, objects, attributesFactory, capabilityNotationParser);
}

/**
* Dependency provider for <b>guava</b> with <b>com.google.guava:guava</b> coordinates and
* with version reference <b>guava</b>
* <p>
* This dependency was declared in catalog libs.versions.toml
*/
public Provider<MinimalExternalModuleDependency> getGuava() {
return create("guava");
}

/**
* Group of libraries at <b>junit</b>
*/
public JunitLibraryAccessors getJunit() {
return laccForJunitLibraryAccessors;
}

/**
* Group of versions at <b>versions</b>
*/
public VersionAccessors getVersions() {
return vaccForVersionAccessors;
}

/**
* Group of bundles at <b>bundles</b>
*/
public BundleAccessors getBundles() {
return baccForBundleAccessors;
}

/**
* Group of plugins at <b>plugins</b>
*/
public PluginAccessors getPlugins() {
return paccForPluginAccessors;
}

public static class JunitLibraryAccessors extends SubDependencyFactory {

public JunitLibraryAccessors(AbstractExternalDependencyFactory owner) { super(owner); }

/**
* Dependency provider for <b>jupiter</b> with <b>org.junit.jupiter:junit-jupiter</b> coordinates and
* with version reference <b>junit.jupiter</b>
* <p>
* This dependency was declared in catalog libs.versions.toml
*/
public Provider<MinimalExternalModuleDependency> getJupiter() {
return create("junit.jupiter");
}

}

public static class VersionAccessors extends VersionFactory {

private final JunitVersionAccessors vaccForJunitVersionAccessors = new JunitVersionAccessors(providers, config);
public VersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }

/**
* Version alias <b>guava</b> with value <b>33.0.0-jre</b>
* <p>
* If the version is a rich version and cannot be represented as a
* single version string, an empty string is returned.
* <p>
* This version was declared in catalog libs.versions.toml
*/
public Provider<String> getGuava() { return getVersion("guava"); }

/**
* Group of versions at <b>versions.junit</b>
*/
public JunitVersionAccessors getJunit() {
return vaccForJunitVersionAccessors;
}

}

public static class JunitVersionAccessors extends VersionFactory {

public JunitVersionAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }

/**
* Version alias <b>junit.jupiter</b> with value <b>5.10.2</b>
* <p>
* If the version is a rich version and cannot be represented as a
* single version string, an empty string is returned.
* <p>
* This version was declared in catalog libs.versions.toml
*/
public Provider<String> getJupiter() { return getVersion("junit.jupiter"); }

}

public static class BundleAccessors extends BundleFactory {

public BundleAccessors(ObjectFactory objects, ProviderFactory providers, DefaultVersionCatalog config, ImmutableAttributesFactory attributesFactory, CapabilityNotationParser capabilityNotationParser) { super(objects, providers, config, attributesFactory, capabilityNotationParser); }

}

public static class PluginAccessors extends PluginFactory {

public PluginAccessors(ProviderFactory providers, DefaultVersionCatalog config) { super(providers, config); }

}

}
Loading