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

Update Dependencies #63

Merged
merged 10 commits into from
Mar 15, 2024
Merged
19 changes: 19 additions & 0 deletions .github/workflows/gradle-dependencies.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Gradle Dependency Submission

on:
push:
paths:
- '**/*.gradle'
- '.github/workflows/dependencies.yaml'

permissions:
contents: write

jobs:
dependency-submission:
runs-on: ubuntu-latest
steps:
- name: Checkout sources
uses: actions/checkout@v4
- name: Generate and submit dependency graph
uses: gradle/actions/dependency-submission@v3
10 changes: 3 additions & 7 deletions annotation-processor/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,14 +20,10 @@ repositories {

// Project dependencies
dependencies {
// https://mvnrepository.com/artifact/com.google.auto.service/auto-service-annotations
implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: '1.1.1'
implementation group: 'com.google.auto.service', name: 'auto-service-annotations', version: autoServiceVersion
annotationProcessor group: 'com.google.auto.service', name: 'auto-service', version: autoServiceVersion

// https://mvnrepository.com/artifact/com.google.auto.service/auto-service
annotationProcessor group: 'com.google.auto.service', name: 'auto-service', version: '1.1.1'

// Framework
implementation project(":framework")
implementation project(':framework')
}

// ------------------- Build -------------------
Expand Down
46 changes: 13 additions & 33 deletions framework/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@ plugins {
id "java"
id 'maven-publish'
id 'signing'
// https://plugins.gradle.org/plugin/org.openjfx.javafxplugin
id "org.openjfx.javafxplugin" version "0.1.0"
id "org.openjfx.javafxplugin" version "$javaFxPluginVersion"
}

group = projectGroup
Expand All @@ -22,51 +21,32 @@ repositories {

// JavaFX dependencies
javafx {
version = '21.0.2'
version = javaFxVersion
modules = ['javafx.controls', 'javafx.graphics', 'javafx.fxml', 'javafx.media']
}

// Project dependencies
dependencies {
// https://mvnrepository.com/artifact/org.jetbrains/annotations
implementation group: 'org.jetbrains', name: 'annotations', version: '24.1.0'
implementation group: 'org.jetbrains', name: 'annotations', version: jetbrainsAnnotationsVersion
implementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: rxJavaVersion

// https://mvnrepository.com/artifact/com.google.dagger/dagger
implementation group: 'com.google.dagger', name: 'dagger', version: '2.51'

// https://mvnrepository.com/artifact/com.google.dagger/dagger-compiler
annotationProcessor group: 'com.google.dagger', name: 'dagger-compiler', version: '2.51'

// https://mvnrepository.com/artifact/io.reactivex.rxjava3/rxjava
implementation group: 'io.reactivex.rxjava3', name: 'rxjava', version: '3.1.8'
implementation group: 'com.google.dagger', name: 'dagger', version: daggerVersion
annotationProcessor group: 'com.google.dagger', name: 'dagger-compiler', version: daggerVersion
}

// ------------------- Tests -------------------

// Test dependencies
dependencies {
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: junitJupiterVersion
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: junitJupiterVersion

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
testImplementation group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.10.1'

// https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
testRuntimeOnly group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.10.1'

// https://mvnrepository.com/artifact/org.testfx/testfx-junit5
testImplementation group: 'org.testfx', name: 'testfx-junit5', version: '4.0.17'

// https://mvnrepository.com/artifact/org.hamcrest/hamcrest
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: '2.2'

// https://mvnrepository.com/artifact/org.testfx/openjfx-monocle
testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: '17.0.10'

// https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: '5.11.0'

// https://mvnrepository.com/artifact/com.google.dagger/dagger-compiler
testAnnotationProcessor group: 'com.google.dagger', name: 'dagger-compiler', version: '2.51'
testImplementation group: 'org.testfx', name: 'testfx-junit5', version: testFxVersion
testImplementation group: 'org.testfx', name: 'openjfx-monocle', version: monocleVersion
testImplementation group: 'org.mockito', name: 'mockito-junit-jupiter', version: mockitoVersion
testImplementation group: 'org.hamcrest', name: 'hamcrest', version: hamcrestVersion

testAnnotationProcessor group: 'com.google.dagger', name: 'dagger-compiler', version: daggerVersion
}

test {
Expand Down
54 changes: 54 additions & 0 deletions gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,57 @@ javaSourceVersion = 17
javaTargetVersion = 17
generateSourcesJar = false
generateJavadocJar = false

# --------------- Gradle Plugins ---------------

# https://plugins.gradle.org/plugin/com.github.johnrengelman.shadow
shadowPluginVersion = 7.0.0

# https://plugins.gradle.org/plugin/org.openjfx.javafxplugin
javaFxPluginVersion = 0.1.0

# https://plugins.gradle.org/plugin/org.fulib.fulibGradle
fulibGradlePluginVersion = 0.5.0

# --------------- Dependencies ---------------

# https://mvnrepository.com/artifact/org.openjfx/javafx-base
javaFxVersion = 21.0.2

# https://mvnrepository.com/artifact/org.jetbrains/annotations
jetbrainsAnnotationsVersion = 24.1.0

# https://mvnrepository.com/artifact/com.google.dagger/dagger
# https://mvnrepository.com/artifact/com.google.dagger/dagger-compiler
daggerVersion = 2.51

# https://mvnrepository.com/artifact/io.reactivex.rxjava3/rxjava
rxJavaVersion = 3.1.8

# https://mvnrepository.com/artifact/com.google.auto.service/auto-service
# https://mvnrepository.com/artifact/com.google.auto.service/auto-service-annotations
autoServiceVersion = 1.1.1

# https://mvnrepository.com/artifact/org.fulib/fulib
fulibVersion = 1.6.2

# https://mvnrepository.com/artifact/org.fulib/fulibScenarios
fulibScenariosVersion = 1.7.1

# --------------- Test Dependencies ---------------

# https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api
# https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-engine
junitJupiterVersion = 5.10.2

# https://mvnrepository.com/artifact/org.testfx/testfx-junit5
testFxVersion = 4.0.18

# https://mvnrepository.com/artifact/org.testfx/openjfx-monocle
monocleVersion = 17.0.10

# https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter
mockitoVersion = 5.11.0

# https://mvnrepository.com/artifact/org.hamcrest/hamcrest
hamcrestVersion = 2.2
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
4 changes: 3 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
networkTimeout=10000
validateDistributionUrl=true
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading
Loading