Skip to content

Commit

Permalink
Merge pull request #831 from CypherpunkArmory/master
Browse files Browse the repository at this point in the history
Fix gradle issue. (#830)
  • Loading branch information
Matthew Tighe authored May 13, 2019
2 parents 6830661 + 5e42d7d commit dffa629
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 13 deletions.
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ reference:

configure_sentry: &configure_sentry
run:
name: Export tracepot https environment variable
name: Configure Sentry for production use
command: |
mkdir app/src/main/resources
echo "dsn=$SENTRY_DSN" >> app/src/main/resources/sentry.properties
Expand Down
8 changes: 0 additions & 8 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -85,14 +85,6 @@ configurations {
ktlint
}

tasks.whenTaskAdded { task ->
if (task.name == 'assembleRelease') {
task.doFirst {
assert tracepotPropertiesFile.exists()
}
}
}

tasks.withType(Test) {
jacoco.includeNoLocationClasses = true
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,7 @@ class MainActivityViewModel(

private val state = MediatorLiveData<State>()

// Inlining this function allows generation of discrete logs for each error type, as Tracepot
// seems to organize them by line number.
@Suppress("NOTHING_TO_INLINE")
private inline fun postIllegalStateWithLog(newState: IllegalState) {
private fun postIllegalStateWithLog(newState: IllegalState) {
logger.sendIllegalStateLog(newState)
state.postValue(newState)
}
Expand Down

0 comments on commit dffa629

Please sign in to comment.