# HG changeset patch # User Jay Gindin # Date 1440379747 25200 # Sun Aug 23 18:29:07 2015 -0700 # Node ID b83751446f41afa10716e47cc16e50643bfef632 # Parent 0d41be31ee195a5c577162d914744e47b0f8200b Move about.html into templates dir; copy it into place during the build, replacing the version placeholder with the actual version. diff --git a/.idea/gradle.xml b/.idea/gradle.xml --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -15,6 +15,15 @@ + diff --git a/Android/build.gradle b/Android/build.gradle --- a/Android/build.gradle +++ b/Android/build.gradle @@ -19,7 +19,6 @@ apply from: '../common/gindin-versioning.gradle' - android { compileSdkVersion 22 buildToolsVersion "21.1.2" @@ -39,10 +38,20 @@ versionCode appVersionCode versionName appVersionName + + String replace = appVersionName; + + copy { + from( 'src/template/assets/com/gindin/zmanim/android/about.html' ) { + filter{ String line -> line.replace( "@@VERSION@@", replace ) } + } + into 'src/main/assets/com/gindin/zmanim/android' + } } buildTypes { release { + minifyEnabled false proguardFiles getDefaultProguardFile( 'proguard-android.txt' ), 'proguard-rules.pro' signingConfig signingConfigs.release @@ -57,7 +66,5 @@ } dependencies { - compile fileTree( include: ['*.jar'], dir: 'libs' ) - compile 'com.android.support:appcompat-v7:22.2.1' - compile project( ':ZmanLib' ) + } diff --git a/Android/src/main/assets/com/gindin/zmanim/android/about.html b/Android/src/template/assets/com/gindin/zmanim/android/about.html rename from Android/src/main/assets/com/gindin/zmanim/android/about.html rename to Android/src/template/assets/com/gindin/zmanim/android/about.html --- a/Android/src/main/assets/com/gindin/zmanim/android/about.html +++ b/Android/src/template/assets/com/gindin/zmanim/android/about.html @@ -6,9 +6,9 @@

Copyright © 2009-2015 Jay R. Gindin -
- Version 4.0.246.c8125610320c + + Version @@VERSION@@
See Zmanim for full details, version change lists, and bug tracking.
This project is made possible by using the following libraries: diff --git a/Android/version.properties b/Android/version.properties --- a/Android/version.properties +++ b/Android/version.properties @@ -1,2 +1,2 @@ -#Sun Aug 16 22:22:18 PDT 2015 -AI_VERSION_CODE=250 +#Wed Aug 19 22:43:58 PDT 2015 +AI_VERSION_CODE=252 diff --git a/ZehutYosef/ZehutYosef.iml b/ZehutYosef/ZehutYosef.iml --- a/ZehutYosef/ZehutYosef.iml +++ b/ZehutYosef/ZehutYosef.iml @@ -106,14 +106,14 @@ - - + + + - diff --git a/ZehutYosef/build.gradle b/ZehutYosef/build.gradle --- a/ZehutYosef/build.gradle +++ b/ZehutYosef/build.gradle @@ -56,8 +56,6 @@ } dependencies { - compile fileTree( include: ['*.jar'], dir: 'libs' ) - compile 'com.android.support:appcompat-v7:22.2.1' /* https://github.com/mikepenz/MaterialDrawer */ compile( 'com.mikepenz:materialdrawer:3.0.8@aar' ) { @@ -65,8 +63,8 @@ } /* https://github.com/mikepenz/AboutLibraries */ - compile( 'com.mikepenz:aboutlibraries:5.0.6@aar' ) { + compile( 'com.mikepenz:aboutlibraries:5.1.1@aar' ) { transitive = true } - compile project( ':ZmanLib' ) + } diff --git a/common/gindin-android.gradle b/common/gindin-android.gradle --- a/common/gindin-android.gradle +++ b/common/gindin-android.gradle @@ -34,4 +34,11 @@ } } +} + +dependencies { + compile fileTree( include: ['*.jar'], dir: 'libs' ) + compile 'com.android.support:appcompat-v7:22.2.1' + + compile project( ':ZmanLib' ) } \ No newline at end of file