Skip to content

Commit 7ccb4b6

Browse files
JamzTheManJamzTheMan
committed
Merge remote-tracking branch 'origin/release-1.5.0'
2 parents 8b002ab + af15aee commit 7ccb4b6

File tree

1,846 files changed

+263633
-138957
lines changed

Some content is hidden

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

1,846 files changed

+263633
-138957
lines changed

‎.appveyor.yml

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
version: '{branch}.{build}'
2+
pull_requests:
3+
do_not_increment_build_number: true
4+
skip_non_tags: false
5+
platform: x64
6+
image:
7+
- Ubuntu
8+
- Visual Studio 2017
9+
init:
10+
- cmd: git config --global core.autocrlf true
11+
install:
12+
- sh: cd ..
13+
- sh: mkdir java
14+
- sh: cd java
15+
- sh: wget http://www.nerps.net/jdk10/jdk-10.0.2_linux-x64_bin.tar.gz
16+
- sh: tar zxf jdk-10.0.2_linux-x64_bin.tar.gz
17+
- sh: export JAVA_HOME=$(pwd)/jdk-10.0.2
18+
- sh: echo java home is $JAVA_HOME
19+
- sh: export PATH=$JAVA_HOME/bin:$PATH
20+
- sh: echo $PATH
21+
- sh: cd ../maptool
22+
- sh: sudo apt install -y fakeroot
23+
- ./gradlew -version
24+
- java -version
25+
build_script:
26+
- ./gradlew build -x test
27+
after_build:
28+
- sh: if [[ $APPVEYOR_REPO_TAG == "true" ]]; then ./gradlew deploy; else echo "Not creating deploy artifacts because this is not a tag build."; fi
29+
- cmd: IF "%APPVEYOR_REPO_TAG%"=="true" (gradlew deploy) ELSE (echo Not creating deploy artifacts because this is not a tag build.)
30+
artifacts:
31+
- path: build\libs\MapTool-*.jar
32+
name: MapTool-Jar
33+
- path: releases\release-*\MapTool-*.exe
34+
name: MapTool-Windows
35+
- path: releases\release-*\MapTool-*.deb
36+
name: MapTool-Linux
37+
deploy:
38+
- provider: GitHub
39+
description: Release build from AppVeyor
40+
auth_token: $(GITHUB_RELEASE_KEY)
41+
artifact: MapTool-Jar, MapTool-Windows, MapTool-Linux
42+
draft: false
43+
prerelease: true
44+
force_update: false
45+
on:
46+
APPVEYOR_REPO_TAG: true
47+
on_success:
48+
- ps: Invoke-RestMethod $env:APPVEYOR_DISCORD_WEBHOOK_SCRIPT_URL -o send.ps1
49+
- ps: ./send.ps1 success $env:DISCORD_URL
50+
on_failure:
51+
- ps: Invoke-RestMethod $env:APPVEYOR_DISCORD_WEBHOOK_SCRIPT_URL -o send.ps1
52+
- ps: ./send.ps1 failure $env:DISCORD_URL

‎.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
---
2+
name: Bug report
3+
about: Create a report to help us improve
4+
5+
---
6+
7+
**Describe the bug**
8+
A clear and concise description of what the bug is.
9+
10+
**To Reproduce**
11+
Steps to reproduce the behavior:
12+
1. Go to '...'
13+
2. Click on '....'
14+
3. If macro related, sample macro code '....'
15+
4. See error
16+
17+
**Expected behavior**
18+
A clear and concise description of what you expected to happen.
19+
20+
**Screenshots**
21+
If applicable, add screenshots to help explain your problem.
22+
23+
**MapTool Info**
24+
- Version: 1.5.4.3
25+
- Install: New, Upgrade [previous version], or JAR [Java Version]
26+
27+
**Desktop (please complete the following information):**
28+
- OS: [e.g. Windows, Linux [Ubuntu, Debian, CentOS, etc], MacOS]
29+
- Version [10, 18.04]
30+
31+
**Additional context**
32+
Add any other context about the problem here.
33+
From MapTool, paste info from menu Help -> Gather Debug Information...
34+
You can also attach files (drag and drop here) such as log files or paste a file sharing link.

‎.github/ISSUE_TEMPLATE/feature_request.md

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
---
2+
name: Feature request
3+
about: Suggest an idea for this project
4+
5+
---
6+
7+
**Is your feature request related to a problem? Please describe.**
8+
A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
9+
10+
**Describe the solution you'd like**
11+
A clear and concise description of what you want to happen.
12+
13+
**Describe alternatives you've considered**
14+
A clear and concise description of any alternative solutions or features you've considered.
15+
16+
**Additional context**
17+
Add any other context or screenshots about the feature request here.

‎.github/ISSUE_TEMPLATE/submit-a-question.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
---
2+
name: Submit a Question
3+
about: Technical Questions
4+
5+
---
6+
7+
**Describe your question**
8+
A clear and concise question regarding this Fork, how to contribute, or similar topics.
9+
10+
*This should NOT be used for general questions on use of MapTool*
11+
For user support, please post your question on the Forums: http://forums.rptools.net
12+
Or on our Discord channel: [Invite Link](https://discord.gg/2FCwhZ9)
13+
Or on Reddit: [r/MapTool](https://www.reddit.com/r/MapTool/)

‎.github/move.yml

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# Configuration for move-issues - https://github.com/dessant/move-issues
2+
3+
# Delete the command comment when it contains no other content
4+
deleteCommand: true
5+
6+
# Close the source issue after moving
7+
closeSourceIssue: true
8+
9+
# Lock the source issue after moving
10+
lockSourceIssue: false
11+
12+
# Mention issue and comment authors
13+
mentionAuthors: true
14+
15+
# Preserve mentions in the issue content
16+
keepContentMentions: false
17+
18+
# Move labels that also exist on the target repository
19+
moveLabels: true
20+
21+
# Set custom aliases for targets
22+
# aliases:
23+
# r: repo
24+
# or: owner/repo
25+
26+
# Repository to extend settings from
27+
# _extends: repo

‎.github/no-response.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
# Configuration for probot-no-response - https://github.com/probot/no-response
2+
3+
# Number of days of inactivity before an Issue is closed for lack of response
4+
daysUntilClose: 30
5+
# Label requiring a response
6+
responseRequiredLabel: info needed
7+
# Comment to post when closing an Issue for lack of response. Set to `false` to disable
8+
closeComment: >
9+
This issue has been automatically closed because there has been no response
10+
to our request for more information from the original author. With only the
11+
information that is currently in the issue, we don't have enough information
12+
to take action. Please reach out if you have or find the answers we need so
13+
that we can investigate further.

‎.gitignore

Lines changed: 45 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,45 @@
1-
.gradle/
2-
build/
3-
/bin/
4-
5-
# OS generated files
6-
################################################################################
7-
.DS_Store
8-
.DS_Store?
9-
._*
10-
.Spotlight-V100
11-
.Trashes
12-
Icon?
13-
ehthumbs.db
14-
Thumbs.db
15-
16-
17-
# Others
18-
################################################################################
19-
*.log
20-
*~
21-
target/
22-
out/
23-
24-
25-
# IDEs
26-
################################################################################
27-
*.iml
28-
.idea/
29-
.*.sw[p0-9]
30-
.sw[p0-9]
31-
.project
32-
.settings/
33-
.classpath
34-
.history
35-
36-
37-
# Keystore
38-
build-resources/rptools-keystore
39-
40-
# Generated
41-
build-resources/jWrapper/
42-
#build-resources/jWrapper/JWrapperLaunchTemp
43-
#build-resources/jWrapper/jwrapper.xml
1+
# OS generated files
2+
################################################################################
3+
.DS_Store
4+
.DS_Store?
5+
._*
6+
.Spotlight-V100
7+
.Trashes
8+
Icon?
9+
ehthumbs.db
10+
Thumbs.db
11+
12+
13+
# Others
14+
################################################################################
15+
.gradle
16+
build/
17+
/bin/
18+
target/
19+
out/
20+
/releases/
21+
*.log
22+
*~
23+
\${sys:appHome}/
24+
25+
26+
# Automatically Generated
27+
################################################################################
28+
package/windows/MapTool.iss
29+
src/main/resources/sentry.properties
30+
31+
32+
# IDEs
33+
################################################################################
34+
*.iml
35+
.idea/
36+
.*.sw[p0-9]
37+
.sw[p0-9]
38+
.project
39+
.settings/
40+
.classpath
41+
.history
42+
workbench.xmi
43+
44+
# Keystore
45+
build-resources/rptools-keystore

‎.travis.yml

Lines changed: 46 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,48 @@
11
language: java
2-
script: gradle build
3-
jdk:
4-
- oraclejdk8
2+
sudo: false
3+
matrix:
4+
include:
5+
- os: osx
6+
osx_image: xcode10
7+
script:
8+
- ./gradlew build -x test
9+
before_deploy:
10+
# Install Sentry.io CLI
11+
- curl -sL https://sentry.io/get-cli/ | bash
12+
- sentry-cli info
13+
- echo Version is $TRAVIS_TAG
14+
# Create a Sentry release
15+
- sentry-cli releases new "$TRAVIS_TAG"
16+
# Create Deploy Artifacts
17+
- ./gradlew deploy
18+
deploy:
19+
provider: releases
20+
api_key: $GITHUB_RELEASE_KEY
21+
file_glob: true
22+
file: releases/release-*/*
23+
overwrite: true
24+
skip_cleanup: true
25+
target_commitish: $TRAVIS_COMMIT
26+
tag_name: $TRAVIS_TAG
27+
draft: true
28+
on:
29+
repo: $REPO
30+
tags: true
31+
all_branches: true
532
notifications:
6-
slack:
7-
secure: Issnni/GrSCwmvwAC/JRdLAZe3863ahnY46muQnt2yhgmcT9ygWsjkyCewwPtkfb0sFT+PRmymeOrMwFJk/4DaCr8F0kFY6bbSICWzy5ovrbJypCqsrS6am0GTxWvGkwcYyihh94HW6mIR+siiJF0s0S6J4nzWqW0h8T7p3iZNY38FlZImaAH4xXI9t3kJ1uuZ4QvI7d738rwaGHDRy1uhCF465oWDgaRujM4R6PZPf/lJE8JQRquULjYdHwdzIy/57zNX8/knrpbMpN3mpBjMdoM7RQKkW22eQfwGwVzx/1NZBPcOn2BAYL5rMVpRPQOnqf2dO8uzP+z5MbtQ7j588BfRuvQ3AVYlJgLIrltMmb6S+XQmHG9wiQ9efhH7/1Nbv+MchHujUGym/cVIbrWhWKJbfVg7zP9QiMDQdP24rVE2OjL6Fg1YI/81faFlOPKRx0JwLCAnfmwxudc7H6vb4jaWmrPWYbA5n67ZPEAb7RkFTG1ZQu6XBioIsvz8HjiRegL3hPpHSScEyK6TZCkcFIawPIauM6en5uD+nfZ7RI7AtG8IK8dSyJoV+PxNMRQHqwQHSUQSa4xd2uJlNSKej9pQwmtTL4qVsW4UqPt/wyZMRIBweOedwFvCkG5rupEGo7WouiVymnLH2BUlLuI3TpJDL9oeH1EZKlFYltzlY=
33+
webhooks:
34+
on_success:
35+
- wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
36+
- chmod +x send.sh
37+
- ./send.sh success $DISCORD_URL
38+
on_failure:
39+
- wget $TRAVIS_DISCORD_WEBHOOK_SCRIPT_URL
40+
- chmod +x send.sh
41+
- ./send.sh failure $DISCORD_URL
42+
after_deploy:
43+
# Finalize Sentry release
44+
- sentry-cli releases finalize "$TRAVIS_TAG"
45+
# Associate commits with the Sentry release
46+
- sentry-cli releases set-commits "$TRAVIS_TAG" --auto
47+
# Tell Sentry.io we have deployed a release
48+
- sentry-cli releases deploys "$TRAVIS_TAG" new -e Production

0 commit comments

Comments
 (0)