Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Plugin for Android Smartwatches #1954

Closed
wants to merge 2 commits into from
+521 −5
Closed

Plugin for Android Smartwatches #1954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e415639
SmartNaviWatch Plugin added to updated code, fixed library issues
and01 Nov 23, 2015
054aa86
check if minsdk is 19 or above for plugin to be added
and01 Nov 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 OsmAnd/AndroidManifest.xml
View file
Open in desktop
@@ -5,7 +5,7 @@
android:versionCode="231"
package="net.osmand.plus">

<uses-sdk android:minSdkVersion="14" android:targetSdkVersion="21" />
<uses-sdk android:minSdkVersion="19" android:targetSdkVersion="21" />


<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
15 OsmAnd/build.gradle
View file
Open in desktop
@@ -19,7 +19,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "23.0.1"
buildToolsVersion "21.1.2"

signingConfigs {
development {
@@ -38,12 +38,14 @@ android {
}

defaultConfig {
minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 14
minSdkVersion System.getenv("MIN_SDK_VERSION") ? System.getenv("MIN_SDK_VERSION").toInteger() : 19
targetSdkVersion 21
multiDexEnabled true

versionCode System.getenv("APK_NUMBER_VERSION") ? System.getenv("APK_NUMBER_VERSION").toInteger() : versionCode
//versionName already assigned in code
//versionName System.getenv("APK_VERSION")? System.getenv("APK_VERSION").toString(): versionName

}

lintOptions {
@@ -59,7 +61,8 @@ android {
}

dexOptions {
jumboMode = true
incremental true
javaMaxHeapSize "4g"
}

sourceSets {
@@ -320,6 +323,10 @@ repositories {
// mavenCentral()
}

configurations {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we want to exclude it?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don’t. I got commited by mistake..

On 25 Nov 2015, at 16:25, vshcherb notifications@github.com wrote:

In OsmAnd/build.gradle:

@@ -320,6 +323,10 @@ repositories {
// mavenCentral()
}

+configurations {

Why do we want to exclude it?

—
Reply to this email directly or view it on GitHub.

all*.exclude group: 'com.android.support', module: 'support-v4'
}

dependencies {
compile project(path: ":OsmAnd-java", configuration: "android")
compile project(":eclipse-compile:design")
@@ -342,5 +349,7 @@ dependencies {
qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
qtcoreCompile "net.osmand:OsmAndCore_androidNativeRelease:0.1-SNAPSHOT@aar"
qtcoreCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"
compile project(':navigationmessagingapi')
compile 'com.android.support:multidex:1.0.0'

}
3 OsmAnd/src/net/osmand/plus/OsmandApplication.java
View file
Open in desktop
@@ -62,10 +62,11 @@

import btools.routingapp.BRouterServiceConnection;
import btools.routingapp.IBRouterService;
import android.support.multidex.MultiDexApplication;



public class OsmandApplication extends Application {
public class OsmandApplication extends MultiDexApplication {
public static final String EXCEPTION_PATH = "exception.log"; //$NON-NLS-1$
private static final org.apache.commons.logging.Log LOG = PlatformUtil.getLog(OsmandApplication.class);

3 OsmAnd/src/net/osmand/plus/OsmandPlugin.java
View file
Open in desktop
@@ -116,6 +116,9 @@ public static void initPlugins(OsmandApplication app) {
allPlugins.add(new AccessibilityPlugin(app));
allPlugins.add(new OsmEditingPlugin(app));
allPlugins.add(new OsmandDevelopmentPlugin(app));
if (android.os.Build.VERSION.SDK_INT >= 19) {
allPlugins.add(new net.osmand.plus.smartnaviwatch.SmartNaviWatchPlugin(app));
}

activatePlugins(app, enabledPlugins);
}