From 55a4b544b4955d0a9b9c5d6e65e7720c0958c010 Mon Sep 17 00:00:00 2001 From: Alexander Zolotarev Date: Sat, 5 Dec 2015 11:13:22 +0300 Subject: [PATCH] Fixed build errors and updated documentation. --- android/README.txt | 4 ++-- android/build.gradle | 16 +++++++-------- android/gradle.properties | 6 +++--- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- .../src/com/guidewithme/expansion/KeyMap.java | 1 + iOS/offlineguides.xcodeproj/project.pbxproj | 6 +++--- readme.md | 20 +++++++++++++++++++ 7 files changed, 39 insertions(+), 18 deletions(-) diff --git a/android/README.txt b/android/README.txt index 9a456f0..944d9f3 100644 --- a/android/README.txt +++ b/android/README.txt @@ -2,8 +2,8 @@ To compile guides apk you need to create local.properties file with two values: sdk.dir=/Full/path/to/android/sdk ndk.dir=/Full/path/to/android/ndk -and you need to clone mapswithme android api repo (don't forget to update it if already cloned): -cd 3rdparty; git clone git@github.com:mapswithme/api-android.git +and you need to clone mapsme android api repo (don't forget to update it if already cloned): +cd 3rdparty; git clone git@github.com:mapsme/api-android.git Use ./gradlew installDebug (or iD) to build and install debug version or diff --git a/android/build.gradle b/android/build.gradle index b7358cc..021f905 100644 --- a/android/build.gradle +++ b/android/build.gradle @@ -1,9 +1,9 @@ buildscript { repositories { mavenCentral() } - dependencies { classpath 'com.android.tools.build:gradle:0.11.+' } + dependencies { classpath 'com.android.tools.build:gradle:1.3.1' } } -apply plugin: 'android' +apply plugin: 'com.android.application' dependencies { compile propAndroidSupportLibrary @@ -30,8 +30,8 @@ android { buildTypes { debug { - jniDebugBuild true - packageNameSuffix ".debug" + jniDebuggable true + applicationIdSuffix ".debug" } release { @@ -42,7 +42,7 @@ android { defaultConfig { versionCode = Integer.valueOf(GWMvc) versionName = GWMvn - packageName = GWMpn + applicationId = GWMpn minSdkVersion propMinSdkVersion.toInteger() targetSdkVersion propTargetSdkVersion.toInteger() } @@ -63,7 +63,7 @@ android { // replace app name android.applicationVariants.all { variant -> variant.mergeResources.doLast { - File valuesFile = file("${buildDir}/intermediates/res/${variant.dirName}/values/values.xml") + File valuesFile = file("${buildDir}/intermediates/res/merged/${variant.dirName}/values/values.xml") println "Replacing app name in " + valuesFile println "App name = " + GWMappName @@ -96,8 +96,8 @@ task copyNativeLibs(type: Copy, dependsOn: 'ndkBuild') { into new File(buildDir, 'native-libs') } -tasks.withType(Compile) { compileTask -> compileTask.dependsOn ndkBuild } -tasks.withType(Compile) { compileTask -> compileTask.dependsOn copyNativeLibs } +tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn ndkBuild } +tasks.withType(JavaCompile) { compileTask -> compileTask.dependsOn copyNativeLibs } clean.dependsOn 'cleanCopyNativeLibs' clean.dependsOn 'ndkBuildClean' diff --git a/android/gradle.properties b/android/gradle.properties index 261f491..81bbed3 100644 --- a/android/gradle.properties +++ b/android/gradle.properties @@ -4,7 +4,7 @@ GWMpn=com.guidewithme.germany GWMapk=GuideWithMe Germany GWMappName=GuideWithMe Germany GWMndkFlags=propNdkFlags=V=0 NDK_DEBUG=0 -propAndroidSupportLibrary=com.android.support:support-v4:19.1.+ +propAndroidSupportLibrary=com.android.support:support-v4:+ propMinSdkVersion=11 -propTargetSdkVersion=19 -propBuildToolsVersion=19.1 +propTargetSdkVersion=22 +propBuildToolsVersion=22.0.1 diff --git a/android/gradle/wrapper/gradle-wrapper.properties b/android/gradle/wrapper/gradle-wrapper.properties index 49e1ab8..0bcbb42 100644 --- a/android/gradle/wrapper/gradle-wrapper.properties +++ b/android/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Jun 09 21:06:40 HST 2014 +#Sat Dec 05 11:21:19 MSK 2015 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=http\://services.gradle.org/distributions/gradle-1.12-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-2.8-all.zip diff --git a/android/src/com/guidewithme/expansion/KeyMap.java b/android/src/com/guidewithme/expansion/KeyMap.java index 1c9ab65..c8fe5d0 100644 --- a/android/src/com/guidewithme/expansion/KeyMap.java +++ b/android/src/com/guidewithme/expansion/KeyMap.java @@ -14,6 +14,7 @@ public class KeyMap static { + // These keys are unique for each Google Play account. COUTRY_2_KEY.put("hawaii", "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA14T4ru6Wj03NA8e/Gf4/MacpWjk+/j52lAe8Q5TWWlEeiRkvWYAWgT20O2rryGRTCNmgb69rDMch0QrXndenKucRHtG4q9xhF0KCeTFOpU3gHkP/oPmGTvhghDjCYRiQRNgcGDTfsrTDmyDwIaYJzNV9PbDht6e3UbhM+cN06QDTUreU9KSzXtNInXH9tZ4d4S3piO/f1tQRWTqUdNGav2xNaRsNrb61ZUyMdd4X+ap3c25xmsB4/snV61i/P5vEEeknzLaqI0KpCbxvGqSADTYfEycDue/+BXmVpcR7tsn3a/ebIBjUKzU09MwSrHDA01+BB03FF9w2PRUDLAFUdQIDAQAB"); COUTRY_2_KEY.put("california", "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEApcL+Gljmb5RtgCNrzzVJX6NehpniQhHL5YpbNGkY9ydPky/hTa3ThE6Y7fQiNnb1Bai695GPRAIYvHogbLV9YIJOYu1k3DpbrcwTJtSlhi827FS69pSUaGsDEVUxlxerjgCcRcqlYhZUbPi+5ACsQWVMqnHa+WTj3CfGAOuEH0CGhJk03QmMikC5jcWP9v4/ZthsSzeEwc9zX0DwxXzJ/tB0Tn7ot5EYzWGD49Lt0qMzDapmrQzLD2Avib8xtBTq76vXKB+GXKhnrDRQKsXThk00VHLwsj+j9CYgPbx3ExJKJjPSXslkbgCQxkxgFRe2CQG1qmOC0eWUZWugEIulFwIDAQAB"); COUTRY_2_KEY.put("france", "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAtgHuz8EnzqJWMl3YE65hAC71FYOF3vM9cS5JieU42c3Yw5S3owvNgKda+fYo6h65tH+nM5yeHVkgYiRqdV6h0zAGWLH5NcFnIKlQZbp2gUWz4QIrmJPUnevGObVV84q3G0EmMXz1Fyn4KdydMaiE+9RzLn6BAKXPeXtu0XGiyqAGfc5vEVFJ2oDR0+2FFrchFF22tKAa2xe7m6sfUwSDopY8XwYtjUZttgGexTsHlETWelwWJRJs+9kmJCi5YDcUIhtq4UX1KJQTsq9ZToH8RmLLbFIaphqPazz0uNNrvCuVBp2OGzQqIAHVb3oCXCs+ESGROhcPnpZ5/4WMPf6jVwIDAQAB"); diff --git a/iOS/offlineguides.xcodeproj/project.pbxproj b/iOS/offlineguides.xcodeproj/project.pbxproj index b6c6961..40aae36 100644 --- a/iOS/offlineguides.xcodeproj/project.pbxproj +++ b/iOS/offlineguides.xcodeproj/project.pbxproj @@ -5532,7 +5532,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GWM = GuideWithMe; INFOPLIST_FILE = "offlineguides/offlineguides-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; ONLY_ACTIVE_ARCH = YES; PRODUCT_NAME = GuideWithMe; SDKROOT = iphoneos; @@ -5579,7 +5579,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GWM = GuideWithMe; INFOPLIST_FILE = "offlineguides/offlineguides-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = GuideWithMe; SDKROOT = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; @@ -5942,7 +5942,7 @@ GCC_WARN_UNUSED_VARIABLE = YES; GWM = GuideWithMe; INFOPLIST_FILE = "offlineguides/offlineguides-Info.plist"; - IPHONEOS_DEPLOYMENT_TARGET = 5.0; + IPHONEOS_DEPLOYMENT_TARGET = 6.0; PRODUCT_NAME = GuideWithMe; PROVISIONING_PROFILE = ""; SDKROOT = iphoneos; diff --git a/readme.md b/readme.md index f2dbc7a..56e5a92 100644 --- a/readme.md +++ b/readme.md @@ -1,3 +1,23 @@ +Welcome to Offline Travel Guides based on Wikivoyage open data! + +You can check live guides here: http://guidewithme.com/ + +# Basic setup + +All guides apps need pre-built data, which is taken from Wikivoyage project. +Please check out scripts in builder folder to understand how to do it, now they're lacking any documentation. + +NOTE: Guides were never built on Windows. If you manage to do it, please +share a pull request with your fixes. + +For Android, create android/local.properties file with content: +``` +sdk.dir=/full/path/to/android-sdk +ndk.dir=/full/path/to/android-ndk +``` +You also need to clone MAPS.ME android api repo (don't forget to update it if already cloned): +```cd android/3rdparty; git clone git@github.com:mapsme/api-android.git``` + # How to build guide for a new country To add new country to generation list please follow next steps: