Skip to content

Commit

Permalink
upgrade gradle wrapper & dependencies and remove bintray plugin
Browse files Browse the repository at this point in the history
  • Loading branch information
robinfriedli committed Dec 18, 2021
1 parent 35d2d9a commit c310121
Show file tree
Hide file tree
Showing 5 changed files with 169 additions and 141 deletions.
13 changes: 6 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,26 @@ Java XML Persistence API
## Maven
```xml
<dependency>
<groupId>net.robinfriedli</groupId>
<groupId>com.github.robinfriedli</groupId>
<artifactId>JXP</artifactId>
<version>2.0.4</version>
<version>2.0.5</version>
<type>pom</type>
</dependency>

<repository>
<id>jcenter</id>
<name>jcenter-bintray</name>
<url>https://jcenter.bintray.com</url>
<name>jitpack.io</name>
<url>https://jitpack.io</url>
</repository>
```

## Gradle
```gradle
dependencies {
implementation "net.robinfriedli:JXP:2.0.4"
implementation "com.github.robinfriedli:JXP:2.0.5"
}
repositories {
jcenter()
maven { url "https://jitpack.io" }
}
```

Expand Down
38 changes: 9 additions & 29 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
plugins {
id "java"
id "maven-publish"
id "com.jfrog.bintray" version "1.8.4"
id "org.jetbrains.kotlin.jvm" version "1.4.10"
}

Expand All @@ -11,18 +10,18 @@ repositories {
}

dependencies {
implementation "com.google.guava:guava:25.1-jre"
implementation "org.seleniumhq.selenium:selenium-support:3.14.0"
implementation "org.slf4j:slf4j-api:1.7.26"
implementation "com.github.robinfriedli:exec:1.2"
implementation "com.github.robinfriedli:StringList:1.6"
implementation "com.google.guava:guava:31.0.1-jre"
implementation "org.seleniumhq.selenium:selenium-support:4.1.0"
implementation "org.slf4j:slf4j-api:1.7.32"
implementation "com.github.robinfriedli:exec:1.2.2"
implementation "com.github.robinfriedli:StringList:1.6.1"

testCompile "org.testng:testng:7.1.0"
testCompile "com.google.truth:truth:1.0.1"
testImplementation "org.testng:testng:7.4.0"
testImplementation "com.google.truth:truth:1.0.1"
}

group = "net.robinfriedli"
version = "2.0.4"
version = "2.0.5"
description = "JXP"
sourceCompatibility = "8"
targetCompatibility = "8"
Expand Down Expand Up @@ -51,26 +50,7 @@ publishing {
}
}

def bintrayProperties = new Properties()
def bintrayPropertiesFile = file("src/main/resources/bintray.properties")
if (bintrayPropertiesFile.exists()) {
bintrayPropertiesFile.withInputStream { bintrayProperties.load(it) }
} else {
bintrayProperties.setProperty("bintray.user", "empty")
bintrayProperties.setProperty("bintray.key", "empty")
}

bintray {
user = bintrayProperties.get("bintray.user")
key = bintrayProperties.get("bintray.key")
publications = ['maven']
pkg {
repo = rootProject.group
name = "JXP"
}
}

tasks.withType(JavaCompile) {
options.compilerArgs << '-Xlint:unchecked'
options.deprecation = true
}
}
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit c310121

Please sign in to comment.