Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
8bb8e0a6cb
4 changed files with 30 additions and 3 deletions
|
@ -114,13 +114,20 @@ repositories {
|
||||||
artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
|
artifact "ivy/[organisation]/[module]/[revision]/[artifact]-[revision].[ext]"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
jcenter()
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compile project(path: ':OsmAnd-java', configuration: 'android')
|
compile project(path: ':OsmAnd-java', configuration: 'android')
|
||||||
compile 'com.android.support:appcompat-v7:26.1.0'
|
|
||||||
compile 'com.android.support:design:26.1.0'
|
compile 'com.android.support:multidex:1.0.1'
|
||||||
compile fileTree(dir: "libs", include: ["*.jar"])
|
compile 'com.android.support:appcompat-v7:27.1.0'
|
||||||
|
compile 'com.android.support:design:27.1.0'
|
||||||
|
compile 'commons-logging:commons-logging-api:1.1'
|
||||||
|
compile 'com.moparisthebest:junidecode:0.1.1'
|
||||||
|
|
||||||
|
compile fileTree(include: ['gnu-trove-osmand.jar', 'icu4j-49_1_patched.jar'], dir: 'libs')
|
||||||
|
|
||||||
compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
|
compile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
|
||||||
debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
|
debugCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
|
||||||
nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
|
nativeDebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -31,6 +31,21 @@ public class PlatformUtil {
|
||||||
this.fullName = name;
|
this.fullName = name;
|
||||||
this.name = fullName.substring(fullName.lastIndexOf('.') + 1);
|
this.name = fullName.substring(fullName.lastIndexOf('.') + 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void trace(Object message) {
|
||||||
|
if(isTraceEnabled()){
|
||||||
|
android.util.Log.d(TAG, name + " " + message); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void trace(Object message, Throwable t) {
|
||||||
|
if(isTraceEnabled()){
|
||||||
|
android.util.Log.d(TAG, name + " " + message, t); //$NON-NLS-1$
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void debug(Object message) {
|
public void debug(Object message) {
|
||||||
if(isDebugEnabled()){
|
if(isDebugEnabled()){
|
||||||
|
@ -115,6 +130,11 @@ public class PlatformUtil {
|
||||||
return android.util.Log.isLoggable(TAG, android.util.Log.WARN);
|
return android.util.Log.isLoggable(TAG, android.util.Log.WARN);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public boolean isTraceEnabled() {
|
||||||
|
return android.util.Log.isLoggable(TAG, android.util.Log.VERBOSE);
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void warn(Object message) {
|
public void warn(Object message) {
|
||||||
if(isWarnEnabled()){
|
if(isWarnEnabled()){
|
||||||
|
|
Loading…
Reference in a new issue