Skip to content

Commit 375e72f

Browse files
Update 1.3.5
1 parent 19affb3 commit 375e72f

2 files changed

Lines changed: 11 additions & 14 deletions

File tree

build.gradle

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,25 @@
11
plugins {
22
id "java"
3-
id "edu.wpi.first.GradleRIO" version "2019.4.1"
3+
id "edu.wpi.first.GradleRIO" version "2020.1.2"
44
id "maven-publish"
55
}
66

7+
sourceCompatibility = JavaVersion.VERSION_11
8+
targetCompatibility = JavaVersion.VERSION_11
9+
710
// Set this to true to enable desktop support.
811
def includeDesktopSupport = false
912

10-
// Maven central needed for JUnit
11-
repositories {
12-
mavenCentral()
13-
}
14-
1513
javadoc {
1614
source = sourceSets.main.allJava
17-
classpath = configurations.compile
15+
classpath = sourceSets.main.runtimeClasspath
1816
}
1917

2018
// Defining my dependencies. In this case, WPILib (+ friends), and vendor libraries.
2119
// Also defines JUnit 4.
2220
dependencies {
2321
implementation wpi.deps.wpilib()
2422
implementation wpi.deps.vendor.java()
25-
testImplementation 'junit:junit:4.12'
2623
}
2724

2825
ext {
@@ -51,7 +48,7 @@ publishing {
5148
artifact javadocJar
5249
groupId = 'pw.otake.pseudoresonance'
5350
artifactId = 'pixy2-java-api'
54-
version = '1.3.4'
51+
version = '1.3.5'
5552
pom {
5653
name = 'Pixy2JavaAPI'
5754
description = 'Java port of Pixy2 API for FIRST Robotics'
@@ -74,12 +71,12 @@ publishing {
7471
}
7572
repositories {
7673
maven {
77-
def releasesRepoUrl = "http://192.168.1.15:8081/repository/maven-releases/"
78-
def snapshotsRepoUrl = "http://192.168.1.15:8081/repository/maven-snapshots/"
74+
def releasesRepoUrl = "http://192.168.0.20:8081/repository/maven-releases/"
75+
def snapshotsRepoUrl = "http://192.168.0.20:8081/repository/maven-snapshots/"
7976
url = version.endsWith('SNAPSHOT') ? snapshotsRepoUrl : releasesRepoUrl
8077
credentials {
81-
username = project.hasProperty('nexus_username') ? nexus_username : ''
82-
password = project.hasProperty('nexus_password') ? nexus_password : ''
78+
username = project.hasProperty('nexus_username') ? nexus_username : (System.getenv('NEXUS_USERNAME') != null ? System..getenv('NEXUS_USERNAME') : '')
79+
password = project.hasProperty('nexus_password') ? nexus_password : (System.getenv('NEXUS_PASSWORD') != null ? System..getenv('NEXUS_PASSWORD') : '')
8380
}
8481
}
8582
}

settings.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ pluginManagement {
44
repositories {
55
mavenLocal()
66
gradlePluginPortal()
7-
String frcYear = '2019'
7+
String frcYear = '2020'
88
File frcHome
99
if (OperatingSystem.current().isWindows()) {
1010
String publicFolder = System.getenv('PUBLIC')

0 commit comments

Comments
 (0)