Skip to content

Commit 9da03a2

Browse files
author
Matt Bernier
authored
Merge branch 'master' into create-troubleshooting
2 parents f0c5802 + c0d64f2 commit 9da03a2

File tree

9 files changed

+53
-30
lines changed

9 files changed

+53
-30
lines changed

‎.github/PULL_REQUEST_TEMPLATE‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!--
2+
We appreciate the effort for this pull request but before that please make sure you read the contribution guidelines given above, then fill out the blanks below.
3+
4+
5+
Please enter each Issue number you are resolving in your PR after one of the following words [Fixes, Closes, Resolves]. This will auto-link these issues and close them when this PR is merged!
6+
e.g.
7+
Fixes #1
8+
Closes #2
9+
-->
10+
# Fixes #
11+
12+
### Checklist
13+
- [ ] I have made a material change to the repo (functionality, testing, spelling, grammar)
14+
- [ ] I have read the [Contribution Guide] and my PR follows them.
15+
- [ ] I updated my branch with the master branch.
16+
- [ ] I have added tests that prove my fix is effective or that my feature works
17+
- [ ] I have added necessary documentation about the functionality in the appropriate .md file
18+
- [ ] I have added in line documentation to the code I modified
19+
20+
### Short description of what this PR does:
21+
-
22+
-
23+
24+
If you have questions, please send an email to [Sendgrid](mailto:[email protected]), or file a Github Issue in this repository.

‎.travis.yml‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,12 @@
11
language: java
2-
sudo: false
32
jdk:
43
- oraclejdk8
5-
- openjdk7
4+
- openjdk8
5+
before_script:
6+
- chmod a+x gradlew
7+
script:
8+
- ./gradlew build check
69
after_script:
7-
- "./gradlew build"
810
- "./scripts/s3upload.sh"
911
env:
1012
global:

‎CONTRIBUTING.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ Please run your code through:
151151
# Clone your fork of the repo into the current directory
152152
git clone https://github.com/sendgrid/java-http-client
153153
# Navigate to the newly cloned directory
154-
cd sendgrid-python
154+
cd java-http-client
155155
# Assign the original repo to a remote called "upstream"
156156
git remote add upstream https://github.com/sendgrid/java-http-client
157157
```

‎LICENSE.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
The MIT License (MIT)
22

3-
Copyright (c) 2016 SendGrid, Inc.
3+
Copyright (c) 2016-2017 SendGrid, Inc.
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

‎README.md‎

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -117,24 +117,7 @@ try {
117117

118118
<a name="usage"></a>
119119
# Usage
120-
121-
- [Example Code](https://github.com/sendgrid/java-http-client/tree/master/examples)
122-
123-
The example uses SendGrid, you can get your free account [here](https://sendgrid.com/free?source=java-http-client).
124-
125-
First, update your environment with your [SENDGRID_API_KEY](https://app.sendgrid.com/settings/api_keys).
126-
127-
```bash
128-
echo "export SENDGRID_API_KEY='YOUR_API_KEY'" > sendgrid.env
129-
echo "sendgrid.env" >> .gitignore
130-
source ./sendgrid.env
131-
```
132-
133-
```bash
134-
mvn package
135-
cd examples
136-
javac -classpath {path_to}/sendgrid-java-http-client-4.0.0-jar.jar:. Example.java && java -classpath {path_to}/sendgrid-java-http-client-4.0.0-jar.jar:. Example
137-
```
120+
[Library Usage Documentation](USAGE.md)
138121

139122
<a name="roadmap"></a>
140123
# Roadmap

‎TROUBLESHOOTING.md‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,4 @@ When debugging or testing, it may be useful to examine the raw request body to c
1414
You can do this like so:
1515

1616
```java
17-
System.out.println(request.getBody());
18-
```
17+
System.out.println(request.getBody());

‎USAGE.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
# Usage
2+
3+
- [Example Code](https://github.com/sendgrid/java-http-client/tree/master/examples)
4+
5+
The example uses SendGrid, you can get your free account [here](https://sendgrid.com/free?source=java-http-client).
6+
7+
First, update your environment with your [SENDGRID_API_KEY](https://app.sendgrid.com/settings/api_keys).
8+
9+
```bash
10+
echo "export SENDGRID_API_KEY='YOUR_API_KEY'" > sendgrid.env
11+
echo "sendgrid.env" >> .gitignore
12+
source ./sendgrid.env
13+
```
14+
15+
```bash
16+
mvn package
17+
cd examples
18+
javac -classpath {path_to}/sendgrid-java-http-client-4.0.0-jar.jar:. Example.java && java -classpath {path_to}/sendgrid-java-http-client-4.0.0-jar.jar:. Example
19+
```

‎build.gradle‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,6 @@ if (!hasProperty("sonatypeUsername")) {
3131
ext.sonatypePassword = null
3232
}
3333

34-
task wrapper(type: Wrapper) {
35-
gradleVersion = '1.8'
36-
}
37-
3834
buildscript {
3935
dependencies {
4036
classpath 'com.github.jengelman.gradle.plugins:shadow:1.2.4'

‎gradle/wrapper/gradle-wrapper.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
33
distributionPath=wrapper/dists
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-1.8-bin.zip
6+
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

0 commit comments

Comments
 (0)