Skip to content

Commit

Permalink
refactor: gradle java python version upgrade
Browse files Browse the repository at this point in the history
compile and run the tests with new versions of python, java and grade
removed gradle wrapper for cpp and java builds
add the idx config file
  • Loading branch information
galaumang committed May 3, 2024
1 parent 8b6027a commit b284497
Show file tree
Hide file tree
Showing 13 changed files with 20 additions and 688 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@ jobs:
steps:
- name: Checkout latest code
uses: actions/checkout@v1
- name: Set up JDK 11
- name: Set up JDK 21
uses: actions/setup-java@v1
with:
java-version: 11
java-version: 21
- name: Gradle - Build / Test / Sonar tasks
run: cd solutions-java ; gradle clean build sonar
env:
Expand Down
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,5 @@ build
**/bin/

# Python virtual environment
solutions-py/dev
solutions-py/dev
solutions-py/**/__pycache__
11 changes: 11 additions & 0 deletions .idx/dev.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{ pkgs, ... }: {
channel = "stable-23.11";

packages = [
pkgs.jdk21
pkgs.gradle
pkgs.gcc13
pkgs.python311
pkgs.python311Packages.pip
];
}
6 changes: 5 additions & 1 deletion solutions-cpp/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,9 @@ plugins {

// Set the target operating system and architecture for this application
application {
targetMachines.add(machines.macOS.x86_64)
targetMachines = [
machines.linux.x86_64,
machines.windows.x86, machines.windows.x86_64,
machines.macOS.x86_64
]
}
Binary file removed solutions-cpp/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions solutions-cpp/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

244 changes: 0 additions & 244 deletions solutions-cpp/gradlew

This file was deleted.

92 changes: 0 additions & 92 deletions solutions-cpp/gradlew.bat

This file was deleted.

Binary file removed solutions-java/gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
6 changes: 0 additions & 6 deletions solutions-java/gradle/wrapper/gradle-wrapper.properties

This file was deleted.

Loading

0 comments on commit b284497

Please sign in to comment.