Use appcompat as sources

osmandapp · May 3, 2015 · e6d2fe8 · e6d2fe8
1 parent d4263cc
commit e6d2fe8
Show file tree

Hide file tree

Showing 519 changed files with 79,006 additions and 525 deletions.
diff --git a/OsmAnd/build.gradle b/OsmAnd/build.gradle
@@ -142,14 +142,14 @@ android {
 	buildTypes {
 		debug {
 		    // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
-		    minifyEnabled true
-		    proguardFiles 'proguard-project.txt'
+		    // minifyEnabled true
+		    // proguardFiles 'proguard-project.txt'
 			signingConfig signingConfigs.development
 		}
 		release {
 		    // proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-project.txt'
-		    minifyEnabled true
-		    proguardFiles 'proguard-project.txt'
+		    // minifyEnabled true
+		    //proguardFiles 'proguard-project.txt'
 			signingConfig signingConfigs.publishing
 		}
 	}
@@ -294,6 +294,7 @@ repositories {
 }
 
 dependencies {
+    compile project(path: ":eclipse-compile:appcompat", configuration: "android")
 	compile project(path: ":OsmAnd-java", configuration: "android")
 	compile fileTree(
 			dir: "libs",
@@ -305,8 +306,8 @@ dependencies {
 					"OsmAndCore_android.jar",
 					"OsmAndCore_wrapper.jar"])
 	compile "com.github.ksoichiro:android-observablescrollview:1.5.0"
-	compile "com.android.support:appcompat-v7:21.0.3"
-	compile "com.github.shell-software:fab:1.0.5"
+	// compile "com.android.support:appcompat-v7:21.0.3"
+	// compile "com.github.shell-software:fab:1.0.5"
 	legacyCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@jar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_androidNativeDebug:0.1-SNAPSHOT@aar"
 	qtcoredebugCompile "net.osmand:OsmAndCore_android:0.1-SNAPSHOT@aar"

diff --git a/OsmAnd/libs/android-support-v4.jar b/OsmAnd/libs/android-support-v4.jar
diff --git a/OsmAnd/libs/android-support-v7-appcompat.jar b/OsmAnd/libs/android-support-v7-appcompat.jar
diff --git a/OsmAnd/src/net/osmand/plus/Version.java b/OsmAnd/src/net/osmand/plus/Version.java
@@ -96,8 +96,7 @@ public static boolean isFreeVersion(OsmandApplication ctx){
 	}
 
 	public static boolean isDeveloperVersion(OsmandApplication ctx){
-		return "osmand~".equalsIgnoreCase(getAppName(ctx)) || "osmand~f".equalsIgnoreCase(getAppName(ctx)) ;
-
+		return getAppName(ctx).contains("~");
 	}
 
 	public static String getVersionForTracker(OsmandApplication ctx) {