Skip to content

Commit a0275b5

Browse files
Yoel-Perman-BrilliantYoel-Perman-Brilliant
authored
Merge pull request #236 from Spikes-2212-Programming-Guild/dev
Dev
2 parents f371bf7 + dc0e3ff commit a0275b5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+914
-868
lines changed

‎.github/workflows/gradle.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
name: Java CI with Gradle
22

3-
on: [push,pull_request]
3+
on: [ push,pull_request ]
44

55
jobs:
66
build:
77

88
runs-on: ubuntu-latest
99

1010
steps:
11-
- uses: actions/checkout@v2
12-
- name: Set up JDK 11
13-
uses: actions/setup-java@v2
14-
with:
15-
java-version: '11'
16-
distribution: 'adopt'
17-
- name: Grant execute permission for gradlew
18-
run: chmod +x gradlew
19-
- name: Build with Gradle
20-
run: ./gradlew build --scan
11+
- uses: actions/checkout@v2
12+
- name: Set up JDK 17
13+
uses: actions/setup-java@v2
14+
with:
15+
java-version: '17'
16+
distribution: 'adopt'
17+
- name: Grant execute permission for gradlew
18+
run: chmod +x gradlew
19+
- name: Build with Gradle
20+
run: ./gradlew build --scan

‎.gitignore

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,6 @@
44
# Ignore Gradle build output directory
55
build
66

7-
.idea
7+
.idea
8+
9+
bin

‎SpikesLib2.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
{
22
"fileName": "SpikesLib2.json",
33
"name": "SpikesLib2",
4-
"version": "v3.2.1",
4+
"version": "v4.1.0",
5+
"frcYear": "2024",
56
"uuid": "018a8f54-8662-11ec-a8a3-0242ac120002",
67
"jsonUrl": "https://raw.githubusercontent.com/Spikes-2212-Programming-Guild/SpikesLib2/master/SpikesLib2.json",
78
"mavenUrls": [
@@ -14,7 +15,7 @@
1415
{
1516
"groupId": "com.github.Spikes-2212-Programming-Guild",
1617
"artifactId": "SpikesLib2",
17-
"version": "v3.2.1"
18+
"version": "4.1.0"
1819
}
1920
]
2021
}

‎build.gradle

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11

22
plugins {
33
id 'java-library'
4-
id 'maven'
4+
id 'maven-publish'
55
id 'net.researchgate.release' version '2.6.0'
66
}
77

8-
sourceCompatibility = JavaVersion.VERSION_11
9-
targetCompatibility = JavaVersion.VERSION_11
8+
sourceCompatibility = JavaVersion.VERSION_17
9+
targetCompatibility = JavaVersion.VERSION_17
1010

1111
group = 'com.github.Spikes-2212-Programming-Guild'
1212

1313
repositories {
1414
mavenCentral()
1515
maven {
16-
url 'http://devsite.ctr-electronics.com/maven/release'
16+
url 'https://maven.ctr-electronics.com/release/'
1717
}
1818
maven {
1919
url 'https://frcmaven.wpi.edu/artifactory/release'
@@ -23,16 +23,28 @@ repositories {
2323
}
2424
}
2525

26+
publishing {
27+
publications {
28+
mavenJava(MavenPublication) {
29+
groupId = 'org.gradle.sample'
30+
artifactId = 'library'
31+
version = '4.1.0'
32+
33+
from components.java
34+
}
35+
}
36+
}
37+
2638
dependencies {
27-
implementation group: 'com.ctre.phoenix', name: 'api-java', version: '5.30.4'
28-
implementation group: 'com.ctre.phoenix', name: 'wpiapi-java', version: '5.30.4'
29-
implementation group: 'edu.wpi.first.ntcore', name: 'ntcore-java', version: '2023.4.1'
30-
implementation group: 'edu.wpi.first.wpilibNewCommands', name: 'wpilibNewCommands-java', version: '2023.4.1'
31-
implementation group: 'edu.wpi.first.wpilibj', name: 'wpilibj-java', version: '2023.4.1'
32-
implementation group: 'edu.wpi.first.cameraserver', name: 'cameraserver-java', version: '2023.4.1'
33-
implementation group: 'edu.wpi.first.wpiutil', name: 'wpiutil-java', version: '2023.4.1'
34-
implementation group: 'edu.wpi.first.wpimath', name: 'wpimath-java', version: '2023.4.1'
35-
implementation group: 'com.revrobotics.frc', name: 'REVLib-java', version: '2023.1.3'
36-
//I don't know why this necessary, but github needs this for some reason
37-
implementation group: 'com.fasterxml.jackson.core', name: 'jackson-databind', version: '2.0.1'
39+
implementation group: 'com.ctre.phoenix6', name: 'wpiapi-java', version: '24.1.0'
40+
implementation group: 'edu.wpi.first.ntcore', name: 'ntcore-java', version: '2024.2.1'
41+
implementation group: 'edu.wpi.first.wpilibNewCommands', name: 'wpilibNewCommands-java', version: '2024.2.1'
42+
implementation group: 'edu.wpi.first.wpilibj', name: 'wpilibj-java', version: '2024.2.1'
43+
implementation group: 'edu.wpi.first.cameraserver', name: 'cameraserver-java', version: '2024.2.1'
44+
implementation group: 'edu.wpi.first.wpiutil', name: 'wpiutil-java', version: '2024.2.1'
45+
implementation group: 'edu.wpi.first.wpimath', name: 'wpimath-java', version: '2024.2.1'
46+
implementation group: 'edu.wpi.first.wpiunits', name: 'wpiunits-java', version: '2024.2.1'
47+
implementation group: 'com.revrobotics.frc', name: 'REVLib-java', version: '2024.2.0'
48+
implementation group: 'com.ctre.phoenix', name: 'api-java', version: '5.33.0'
49+
implementation group: 'com.ctre.phoenix', name: 'wpiapi-java', version: '5.33.0'
3850
}

‎gradle/wrapper/gradle-wrapper.jar

3.56 KB
Binary file not shown.

‎gradle/wrapper/gradle-wrapper.properties

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
#Sat Nov 23 14:42:52 IST 2019
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.3-all.zip

0 commit comments

Comments
 (0)