Skip to content

Commit c2010ce

Browse files
committed
Update README.md / VERSIONS.md
1 parent 7ab0edb commit c2010ce

File tree

2 files changed

+39
-36
lines changed

2 files changed

+39
-36
lines changed

README.md

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,11 @@ String authToken = "XXXXXXXX"; // Your Auth Token from www.twilio.com/user/accou
2828

2929
Twilio.init(accountSid, authToken);
3030

31-
Message message = Message.create(
32-
ACCOUNT_SID,
33-
new PhoneNumber("+15558881234"),
34-
new PhoneNumber("+15559994321"),
35-
"Hello world!"
36-
).execute();
31+
Message message = Message.creator(
32+
new PhoneNumber("+15558881234"), // To number
33+
new PhoneNumber("+15559994321"), // From number
34+
"Hello world!" // SMS body
35+
).create();
3736

3837
System.out.println(message.getSid());
3938
```
@@ -45,14 +44,13 @@ String authToken = "XXXXXXXX"; // Your Auth Token from www.twilio.com/user/accou
4544

4645
Twilio.init(accountSid, authToken);
4746

48-
Call call = Call.create(
49-
ACCOUNT_SID,
50-
new PhoneNumber("+15558881234"),
51-
new PhoneNumber("+15559994321"),
47+
Call call = Call.creator(
48+
new PhoneNumber("+15558881234"), // To number
49+
new PhoneNumber("+15559994321"), // From number
5250

5351
// Read TwiML at this URL when a call connects (hold music)
5452
new URI("http://twimlets.com/holdmusic?Bucket=com.twilio.music.ambient")
55-
).execute();
53+
).create();
5654

5755
System.out.println(call.getSid());
5856
```

VERSIONS.md

Lines changed: 30 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,31 @@
11
# Versioning Strategy
22

3-
`twilio-java` uses [Semantic Versioning][semver] for all changes to the helper
4-
library. It is strongly encouraged that you pin at least the major version to
5-
avoid pulling in breaking changes.
3+
`twilio-java` uses a modified version of [Semantic Versioning][semver] for all
4+
changes to the helper library. It is strongly encouraged that you pin at least
5+
the major version and potentially the minor version to avoid pulling in breaking
6+
changes.
67

78
Semantic Versions take the form of `MAJOR`.`MINOR`.`PATCH`
89

910
When bugs are fixed in the library in a backwards compatible way, the `PATCH`
10-
level will be incremented by one. `PATCH` changes should _not_ break your code
11-
and are generally safe to upgrade to.
12-
13-
When new features are added to the library in a backwards compatible way, the
14-
`MINOR` level will be incremented by one and the `PATCH` level will be reset to
15-
zero. `MINOR` changes are should _not_ break your code and are generally safe
16-
to upgrade to. After a `MINOR` change you may wish to review the helper library
17-
for new features and functionality.
18-
19-
When a bug or feature requires a breaking change, the `MAJOR` level will be
20-
incremented by one and the `MINOR` and `PATCH` levels will reset to zero. These
21-
changes can break your code. Twilio understands that this can be very
22-
disruptive, we will only introduce breaking changes when absolutely necessary.
23-
Breaking changes will be communicated in advance with `Release Candidates` and a
11+
level will be incremented by one. When new features are added to the library
12+
in a backwards compatible way, the `PATCH` level will be incremented by one.
13+
`PATCH` changes should _not_ break your code and are generally safe for upgrade.
14+
15+
When a new large feature set comes online or a small breaking change is
16+
introduced, the `MINOR` version will be incremented by one and the `PATCH`
17+
version reset to zero. `MINOR` changes _may_ require some amount of manual code
18+
change for upgrade. These backwards-incompatible changes will generally be limited
19+
to a small number of function signature changes.
20+
21+
The `MAJOR` version is used to indicate the family of technology represented by
22+
the helper library. It increased from `6.x.x` to `7.x.x` when Twilio moved to
23+
auto generation of helper libraries. Breaking changes that requires extensive
24+
reworking of code (like the `6.x.x` to `7.x.x` upgrade) will case the `MAJOR`
25+
version to be incremented by one, the `MINOR` and `PATCH` versions will be reset
26+
to zero. Twilio understands that this can be very disruptive, we will only
27+
introduce this type of breaking change when absolutely necessary. New `MAJOR`
28+
versions will be communicated in advance with `Release Candidates` and a
2429
schedule.
2530

2631
## Supported Versions
@@ -35,25 +40,25 @@ features.
3540
Twilio frequently rolls out new features in public and private beta periods.
3641
Twilio strives to ship early and often and bake customer feedback back into our
3742
products. To support that mission, the `twilio-java` helper library has an
38-
`Edge` version based of the `edge` branch. This version is identified with an
39-
`edge` metadata tag on the version number.
43+
`Edge` version based of the `alpha` branch. This version is identified with an
44+
`alpha` metadata tag on the version number.
4045

4146
The way the `Edge` artifact is created is by playing the `Edge` features on top
4247
of our stable artifact. The `Edge` artifact will always have the same version
43-
number as the stable artifact it was created from, but with an `edge` suffix.
48+
number as the stable artifact it was created from, but with an `alpha` suffix.
4449

45-
For example, `5.0.1-edge1` is the `5.0.1` branch with `Edge` features included.
50+
For example, `7.1.0-alpha-1` is the `7.1.0` branch with `Edge` features included.
4651
If there is a change to one of the `Edge` features we may regenerate the `Edge`
47-
artifact and release a new `5.0.1-edge2`, new `Edge` artifacts simply increment
48-
the number after the `edge` suffix. All `Edge` features are considered
52+
artifact and release a new `7.1.0-alpha-2`, new `Edge` artifacts simply increment
53+
the number after the `alpha` suffix. All `Edge` features are considered
4954
unstable and a backwards incompatible change in an `Edge` feature will not cause
50-
any version change so you should take care when upgrading from one `edge`
55+
any version change so you should take care when upgrading from one `alpha`
5156
version to another.
5257

5358
Once an `Edge` feature has matured it will be considered `Mainline` and included
5459
in the stable artifact, with a `MAJOR` or `MINOR` version bump.
5560

5661
To use an `Edge` artifact in your JAVA project you will have to make sure that
57-
you pin the artifact with `edge` stability in your `pom.xml`.
62+
you pin the artifact with `alpha` stability in your `pom.xml`.
5863

5964
[semver]: http://semver.org/

0 commit comments

Comments
 (0)