-
-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #48 from stachu540/feature/2.1
Merge 2.1
- Loading branch information
Showing
116 changed files
with
2,694 additions
and
1,691 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,23 +1,6 @@ | ||
| # Created by .ignore support plugin (hsz.mobi) | ||
| ### Maven template | ||
| target/ | ||
| pom.xml.tag | ||
| pom.xml.releaseBackup | ||
| pom.xml.versionsBackup | ||
| pom.xml.next | ||
| release.properties | ||
| dependency-reduced-pom.xml | ||
| buildNumber.properties | ||
| .mvn/timing.properties | ||
|
|
||
| # Avoid ignoring Maven wrapper jar file (.jar files are usually ignored) | ||
| !/.mvn/wrapper/maven-wrapper.jar | ||
|
|
||
| !.github/ | ||
|
|
||
| ### JetBrains | ||
| .idea/** | ||
| .idea | ||
| *.iml | ||
|
|
||
| src/test/java/com/github/stachu540/hirezapi/*.java | ||
| !src/test/java/com/github/stachu540/hirezapi/HiRezAPITest.java | ||
| out/ | ||
| .gradle | ||
| build/ | ||
| logs/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,130 @@ | ||
| plugins { | ||
| id "idea" | ||
| id "maven" | ||
| id "jacoco" | ||
| id "maven-publish" | ||
| id "net.ltgt.apt" version "0.15" | ||
| id "com.jfrog.bintray" version "1.8.0" | ||
| } | ||
|
|
||
| ext { | ||
| versions = [ | ||
| lombok : "1.16.20", | ||
| slf4j : "1.7.25", | ||
| logback : "1.2.3", | ||
| jackson : "2.9.5", | ||
| rome : "1.9.0", | ||
| commons_lang3 : "3.7", | ||
| okhttp : "3.10.0", | ||
| jsoup : "1.11.3", | ||
| codacy : "4.0.0", | ||
| mockito : "2.18.3", | ||
| junit : "4.12" | ||
| ] | ||
| } | ||
|
|
||
| allprojects { | ||
| group = 'com.github.stachu540' | ||
| version = '2.1.0-SNAPSHOT' | ||
|
|
||
| repositories { | ||
| jcenter() | ||
| } | ||
|
|
||
| plugins.withType(JavaPlugin) { | ||
| plugins.withId("net.ltgt.apt-idea") { | ||
| afterEvaluate { | ||
| project.idea.module.apt.addAptDependencies = false | ||
| } | ||
| } | ||
| } | ||
|
|
||
| } | ||
|
|
||
| subprojects { | ||
| apply plugin: "java" | ||
| apply plugin: "jacoco" | ||
| apply plugin: "net.ltgt.apt" | ||
| apply plugin: "maven-publish" | ||
| apply plugin: "com.jfrog.bintray" | ||
|
|
||
| sourceCompatibility = 1.8 | ||
| targetCompatibility = 1.8 | ||
|
|
||
| ext.subprojectName = (project.name == "HiRezApi") ? "HiRezApi" : "HiRezApi-${project.name}" | ||
|
|
||
| sourceSets { | ||
| main { | ||
| java { | ||
| srcDirs = ['build/generated/source/apt/main', 'src/main/java'] | ||
| } | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile "org.slf4j:slf4j-api:${versions.slf4j}" | ||
| annotationProcessor "org.projectlombok:lombok:${versions.lombok}" | ||
| compileOnly "org.projectlombok:lombok:${versions.lombok}" | ||
|
|
||
| testCompile "junit:junit:${versions.junit}" | ||
| testCompile "org.mockito:mockito-core:${versions.mockito}" | ||
| testCompile "ch.qos.logback:logback-classic:${versions.logback}" | ||
| } | ||
|
|
||
| // custom tasks for creating source/javadoc jars | ||
| task sourcesJar(type: Jar, dependsOn: classes) { | ||
| classifier = 'sources' | ||
| baseName = 'HiRezApi-' + baseName | ||
| from sourceSets.main.allSource | ||
| } | ||
|
|
||
| task javadocJar(type: Jar, dependsOn: javadoc) { | ||
| classifier = 'javadoc' | ||
| baseName = 'HiRezApi-' + baseName | ||
| from javadoc.destinationDir | ||
| } | ||
|
|
||
| artifacts { | ||
| archives javadocJar | ||
| archives sourcesJar | ||
| } | ||
|
|
||
| publishing { | ||
| publications { | ||
| mainProject(MavenPublication) { | ||
| from project.components.java | ||
| groupId group | ||
| artifactId subprojectName | ||
| version version | ||
| artifact sourcesJar | ||
| artifact javadocJar | ||
| } | ||
| } | ||
| } | ||
|
|
||
| bintray { | ||
| user = System.getenv('BINTRAY_USER') | ||
| key = System.getenv('BINTRAY_API_KEY') | ||
| publications = ['mainProject'] | ||
| pkg { | ||
| repo = 'Java' | ||
| name = 'HiRezAPI' | ||
| userOrg = user | ||
| desc = 'Java-Based API Wrapper for Hi-Rez Studios games.' | ||
| websiteUrl = 'https://github.com/stachu540/HiRezAPI' | ||
| vcsUrl = 'https://github.com/stachu540/HiRezAPI.git' | ||
| issueTrackerUrl = 'https://github.com/stachu540/HiRezAPI/issues' | ||
| licenses = ['MIT'] | ||
| labels = ['hi-rez', 'api-wrapper', 'smite', 'paladins'] | ||
| publicDownloadNumbers = true | ||
| version { | ||
| name = project.version | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| wrapper { | ||
| gradleVersion = "4.7" | ||
| distributionType = Wrapper.DistributionType.ALL | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| dependencies { | ||
| compile "com.squareup.okhttp3:okhttp:${versions.okhttp}" | ||
| compile "com.squareup.okhttp3:logging-interceptor:${versions.okhttp}" | ||
| compile "com.fasterxml.jackson.core:jackson-databind:${versions.jackson}" | ||
| compile "org.jsoup:jsoup:${versions.jsoup}" | ||
| compile "org.apache.commons:commons-lang3:${versions.commons_lang3}" | ||
| compile "com.rometools:rome:${versions.rome}" | ||
| } |
Oops, something went wrong.