Skip to content

Commit 6ade10c

Browse files
author
TinaTiel
authored
Merge pull request #44 from Twasi/release/1.3.0
Release/1.3.0
2 parents 1186633 + e003a31 commit 6ade10c

File tree

131 files changed

+3189
-586
lines changed

Some content is hidden

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

131 files changed

+3189
-586
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# Exclude 'Main' java class
22
**/Main.java
33

4+
# Exclude the generated normalized scene collection that can contain personal filepaths
5+
**/TestSceneCollection.json
6+
47
# Filesystem Stuff
58
**.DS_Store
69

@@ -29,3 +32,6 @@ build/
2932
**bower_components
3033

3134
*.sublime*
35+
36+
## Python ##
37+
**__pycache__

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.2.0
1+
1.3.0

build.gradle

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,15 +21,12 @@ java.sourceCompatibility = JavaVersion.VERSION_1_8
2121

2222
repositories {
2323
mavenLocal()
24-
jcenter()
25-
maven {
26-
url = uri('https://repo.maven.apache.org/maven2/')
27-
}
24+
mavenCentral()
2825
}
2926

3027
dependencies {
3128
implementation 'org.eclipse.jetty.websocket:websocket-client:9.4.8.v20171121'
32-
implementation 'com.google.code.gson:gson:2.8.2'
29+
implementation 'com.google.code.gson:gson:2.8.6'
3330
implementation 'org.slf4j:slf4j-api:1.7.30'
3431
implementation 'org.slf4j:slf4j-simple:1.7.30'
3532

@@ -53,6 +50,7 @@ test {
5350

5451
integrationTest {
5552
useJUnitPlatform()
53+
// exclude '**/manual'
5654
}
5755

5856
task javadocJar(type: Jar) {
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-6.8.3-bin.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

0 commit comments

Comments
 (0)