Skip to content

Commit

Permalink
Merge branch 'road-to-2.0.1' into bugfix/joda
Browse files Browse the repository at this point in the history
  • Loading branch information
ticofab authored Jul 10, 2021
2 parents c399df3 + 7be646d commit f621670
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 15 deletions.
6 changes: 1 addition & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,5 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.2.0'

// You should use the commented out line below in your application.
// We depend on the source directly here so that development is easier.
implementation project(':parser')
// implementation 'io.ticofab.androidgpxparser:parser:x.y.z'
implementation 'com.github.ticofab:android-gpx-parser:2.0.0'
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
package io.ticofab.androidgpxparser;

import android.os.Bundle;
import androidx.appcompat.app.AppCompatActivity;
import android.util.Log;

import androidx.appcompat.app.AppCompatActivity;

import org.xmlpull.v1.XmlPullParserException;

import java.io.IOException;
Expand All @@ -20,8 +21,7 @@ public class GPXParserSampleActivity extends AppCompatActivity {

static final String TAG = GPXParserSampleActivity.class.getSimpleName();

// consider injection with, eg. Dagger2
GPXParser mParser = new GPXParser();
GPXParser mParser = new GPXParser(); // consider injection

@Override
protected void onCreate(Bundle savedInstanceState) {
Expand All @@ -31,7 +31,7 @@ protected void onCreate(Bundle savedInstanceState) {
Gpx parsedGpx = null;
try {
InputStream in = getAssets().open("test.gpx");
parsedGpx = mParser.parse(in);
parsedGpx = mParser.parse(in); // consider doing this on a background thread
} catch (IOException | XmlPullParserException e) {
e.printStackTrace();
}
Expand Down
4 changes: 3 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,11 @@ buildscript {
url 'https://maven.google.com/'
name 'Google'
}
maven { url 'https://jitpack.io' }
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:4.1.3'
classpath 'com.android.tools.build:gradle:4.2.1'
}
}

Expand All @@ -21,5 +22,6 @@ allprojects {
url 'https://maven.google.com/'
name 'Google'
}
maven { url 'https://jitpack.io' }
}
}
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1 +1 @@
distributionUrl = https\://services.gradle.org/distributions/gradle-6.5-all.zip
distributionUrl = https\://services.gradle.org/distributions/gradle-6.7.1-all.zip
3 changes: 0 additions & 3 deletions parser/src/main/res/values/strings.xml

This file was deleted.

2 changes: 1 addition & 1 deletion settings.gradle
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':parser', ':app'
include ':parser', ':app'

0 comments on commit f621670

Please sign in to comment.