Skip to content

Commit

Permalink
Merge branch 'hotfix/0.1.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
MichaelRocks committed Apr 25, 2017
2 parents 4a4eb0f + 9ce771b commit fe2ea57
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ buildscript {
}
dependencies {
classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.4'
classpath 'io.michaelrocks:paranoid-gradle-plugin:0.1.5'
}
}
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
allprojects {
ext.kotlinVersion = '1.1.1'
ext.kotlinVersion = '1.1.2'

buildscript {
repositories {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ class Generator(private val stringRegistry: StringRegistry) {
return when (this) {
'\n' -> "'\\n'"
'\r' -> "'\\r'"
'\'' -> "'\\''"
'\\' -> "'\\\\'"
else -> "'\\u%04x'".format(toShort())
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,9 @@ protected void onCreate(final Bundle savedInstanceState) {
setContentView(R.layout.main_activity);

final TextView questionTextView = (TextView) findViewById(R.id.questionTextView);
questionTextView.setText(String.format(QUESTION, "Does it work?"));
questionTextView.setText(String.format(QUESTION, "How does it work?"));

final TextView answerTextView = (TextView) findViewById(R.id.answerTextView);
answerTextView.setText(String.format(ANSWER, "Sure it does!"));
answerTextView.setText(String.format(ANSWER, "It's magic! ¯\\_(ツ)_/¯"));
}
}
2 changes: 1 addition & 1 deletion version.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version.major=0
version.minor=1
version.patch=4
version.patch=5
version.snapshot=false

version.dryRun=false
Expand Down

0 comments on commit fe2ea57

Please sign in to comment.