Skip to content

Commit

Permalink
Fix Undeliverable Exception thrown by the time sources (#4)
Browse files Browse the repository at this point in the history
* Update dependencies

* Fix Undeliverable Exception for time sources
  • Loading branch information
AllanHasegawa authored Jan 6, 2019
1 parent ce7140c commit dcd9b45
Show file tree
Hide file tree
Showing 20 changed files with 352 additions and 296 deletions.
10 changes: 10 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# space indentation for Kotlin
[*.{kt,kts}]
indent_style = space
indent_size = 4
continuation_indent_size = 4
28 changes: 11 additions & 17 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@
ext {
def versionMajor = 0
def versionMinor = 1
def versionPatch = 1
def versionPatch = 2
def versionCode = versionPatch + versionMinor * 100 + versionMajor * 10000

androidConfig = [
compileSdkVersion : 25,
buildToolsVersion : "25.0.3",
compileSdkVersion : 28,
minSdkVersion : 16,
targetSdkVersion : 25,
targetSdkVersion : 28,
versionCode : versionCode,
versionName : "${versionMajor}.${versionMinor}.${versionPatch}",

Expand All @@ -21,11 +20,11 @@ buildscript {
ext {
depPaths = {
def versions = [
gradlePlugin : '2.3.3',
kotlin : '1.1.3',
supportLib : '25.4.0',
rxJava : '2.1.1',
rxAndroid : '2.0.1',
gradlePlugin : '3.2.1',
kotlin : '1.3.11',
supportLib : '28.0.0',
rxJava : '2.2.5',
rxAndroid : '2.1.0',
androidJob : '1.1.11',
play : '11.0.2',

Expand All @@ -40,7 +39,7 @@ buildscript {
gradlePlugin : "com.android.tools.build:gradle:$versions.gradlePlugin",
kotlinPlugin : "org.jetbrains.kotlin:kotlin-gradle-plugin:$versions.kotlin",

kotlinStd : "org.jetbrains.kotlin:kotlin-stdlib-jre7:$versions.kotlin",
kotlinStd : "org.jetbrains.kotlin:kotlin-stdlib:$versions.kotlin",
kotlinReflect : "org.jetbrains.kotlin:kotlin-reflect:$versions.kotlin",
supportAppCompat: "com.android.support:appcompat-v7:$versions.supportLib",
supportDesign : "com.android.support:design:$versions.supportLib",
Expand All @@ -60,10 +59,8 @@ buildscript {
}

repositories {
google()
jcenter()
maven {
url "https://maven.google.com"
}
}

dependencies {
Expand All @@ -77,11 +74,8 @@ buildscript {

allprojects {
repositories {
google()
jcenter()
mavenCentral()
maven {
url "https://maven.google.com"
}
}

}
Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 1 addition & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Fri Jun 30 15:39:57 BRT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.8-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip
72 changes: 42 additions & 30 deletions gradlew
100644 → 100755
Original file line number Diff line number Diff line change
@@ -1,25 +1,43 @@
#!/usr/bin/env bash
#!/usr/bin/env sh

##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`

# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
DEFAULT_JVM_OPTS=""

# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"

warn ( ) {
warn () {
echo "$*"
}

die ( ) {
die () {
echo
echo "$*"
echo
Expand All @@ -30,6 +48,7 @@ die ( ) {
cygwin=false
msys=false
darwin=false
nonstop=false
case "`uname`" in
CYGWIN* )
cygwin=true
Expand All @@ -40,26 +59,11 @@ case "`uname`" in
MINGW* )
msys=true
;;
NONSTOP* )
nonstop=true
;;
esac

# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null

CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar

# Determine the Java command to use to start the JVM.
Expand All @@ -85,7 +89,7 @@ location of your Java installation."
fi

# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
Expand Down Expand Up @@ -150,11 +154,19 @@ if $cygwin ; then
esac
fi

# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
function splitJvmOpts() {
JVM_OPTS=("$@")
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
APP_ARGS=$(save "$@")

# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
cd "$(dirname "$0")"
fi

exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
exec "$JAVACMD" "$@"
14 changes: 4 additions & 10 deletions gradlew.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,14 @@
@rem Set local scope for the variables with windows NT shell
if "%OS%"=="Windows_NT" setlocal

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

set DIRNAME=%~dp0
if "%DIRNAME%" == "" set DIRNAME=.
set APP_BASE_NAME=%~n0
set APP_HOME=%DIRNAME%

@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
set DEFAULT_JVM_OPTS=

@rem Find java.exe
if defined JAVA_HOME goto findJavaFromJavaHome

Expand Down Expand Up @@ -46,10 +46,9 @@ echo location of your Java installation.
goto fail

:init
@rem Get command-line arguments, handling Windowz variants
@rem Get command-line arguments, handling Windows variants

if not "%OS%" == "Windows_NT" goto win9xME_args
if "%@eval[2+2]" == "4" goto 4NT_args

:win9xME_args
@rem Slurp the command line arguments.
Expand All @@ -60,11 +59,6 @@ set _SKIP=2
if "x%~1" == "x" goto execute

set CMD_LINE_ARGS=%*
goto execute

:4NT_args
@rem Get arguments from the 4NT Shell from JP Software
set CMD_LINE_ARGS=%$

:execute
@rem Setup the command line
Expand Down
23 changes: 11 additions & 12 deletions sample/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ apply plugin: 'kotlin-android-extensions'

android {
compileSdkVersion androidConfig.compileSdkVersion
buildToolsVersion androidConfig.buildToolsVersion

defaultConfig {
applicationId "io.tempo.sample"
Expand All @@ -24,18 +23,18 @@ android {
}

dependencies {
compile project(':tempo')
compile project(':tempo-android-job-scheduler')
compile project(':tempo-android-gps-time-source')
compile depPaths.kotlinStd
compile depPaths.supportAppCompat
compile depPaths.supportDesign
compile depPaths.supportCardView
compile depPaths.rxJava
compile depPaths.rxAndroid
implementation project(':tempo')
implementation project(':tempo-android-job-scheduler')
implementation project(':tempo-android-gps-time-source')
implementation depPaths.kotlinStd
implementation depPaths.supportAppCompat
implementation depPaths.supportDesign
implementation depPaths.supportCardView
implementation depPaths.rxJava
implementation depPaths.rxAndroid

testCompile depPaths.junit
androidTestCompile(depPaths.espressoCore, {
testImplementation depPaths.junit
androidTestImplementation(depPaths.espressoCore, {
exclude group: 'com.android.support', module: 'support-annotations'
})
}
9 changes: 5 additions & 4 deletions sample/src/main/java/io/tempo/sample/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ import io.tempo.TempoEvent
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.item_tempo_event.view.*
import java.text.SimpleDateFormat
import java.util.*
import java.util.Date
import java.util.Locale
import java.util.concurrent.TimeUnit

class MainActivity : AppCompatActivity() {
Expand Down Expand Up @@ -105,16 +106,16 @@ class EventsRvAdapter : RecyclerView.Adapter<EventsRvAdapter.VH>() {
}
}

val events = mutableListOf<TempoEvent>()
private val events = mutableListOf<TempoEvent>()

fun addEvent(event: TempoEvent) {
events.add(event)
notifyItemInserted(events.size - 1)
}

override fun onBindViewHolder(holder: VH?, position: Int) {
override fun onBindViewHolder(holder: VH, position: Int) {
events.getOrNull(position)?.let { event ->
holder?.bind(event)
holder.bind(event)
}
}

Expand Down
13 changes: 8 additions & 5 deletions tempo-android-gps-time-source/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@ apply plugin: 'kotlin-android'

android {
compileSdkVersion androidConfig.compileSdkVersion
buildToolsVersion androidConfig.buildToolsVersion

defaultConfig {
minSdkVersion androidConfig.minSdkVersion
Expand All @@ -22,11 +21,15 @@ android {
}

dependencies {
compile project(':tempo')
implementation project(':tempo')
implementation depPaths.kotlinStd
implementation depPaths.rxJava
implementation depPaths.rxAndroid
implementation depPaths.supportAppCompat

testCompile depPaths.junit
androidTestCompile depPaths.hamkrest
androidTestCompile(depPaths.espressoCore, {
testImplementation depPaths.junit
androidTestImplementation depPaths.hamkrest
androidTestImplementation(depPaths.espressoCore, {
exclude group: 'com.android.support', module: 'support-annotations'
})
}
Loading

0 comments on commit dcd9b45

Please sign in to comment.