M .idea/gradle.xml +9 -0
@@ 15,6 15,15 @@
<option value="$PROJECT_DIR$/ZmanUtils" />
</set>
</option>
+ <option name="myModules">
+ <set>
+ <option value="$PROJECT_DIR$" />
+ <option value="$PROJECT_DIR$/Android" />
+ <option value="$PROJECT_DIR$/ZehutYosef" />
+ <option value="$PROJECT_DIR$/ZmanLib" />
+ <option value="$PROJECT_DIR$/ZmanUtils" />
+ </set>
+ </option>
</GradleProjectSettings>
</option>
</component>
M Android/build.gradle +11 -4
@@ 19,7 19,6 @@ project.ext.set( "versionCodeType", Vers
apply from: '../common/gindin-versioning.gradle'
-
android {
compileSdkVersion 22
buildToolsVersion "21.1.2"
@@ 39,10 38,20 @@ android {
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 @@ android {
}
dependencies {
- compile fileTree( include: ['*.jar'], dir: 'libs' )
- compile 'com.android.support:appcompat-v7:22.2.1'
- compile project( ':ZmanLib' )
+
}
M Android/src/main/assets/com/gindin/zmanim/android/about.html => Android/src/template/assets/com/gindin/zmanim/android/about.html +2 -2
@@ 6,9 6,9 @@
<body>
<div style="font-size: 80%">
<br>Copyright © 2009-2015 Jay R. Gindin
- <!-- VERSION STUFF MUST BE PROPERLY PLACED AND FORMATTED FOR THE DYNAMIC TEXT REPLACEMENT!!! -->
<br>
- Version 4.0.246.c8125610320c
+ <!-- VERSION STUFF MUST BE PROPERLY PLACED AND FORMATTED FOR THE DYNAMIC TEXT REPLACEMENT!!! -->
+ Version @@VERSION@@
<br>See <a href='https://bitbucket.org/jgindin/zmanim'>Zmanim</a> for full details, version change lists, and bug tracking.
<br>
This project is made possible by using the following libraries:
M Android/version.properties +2 -2
@@ 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
M ZehutYosef/ZehutYosef.iml +3 -3
@@ 106,14 106,14 @@
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="library" exported="" name="aboutlibraries-5.0.6" level="project" />
<orderEntry type="library" exported="" name="iconics-1.1.0" level="project" />
- <orderEntry type="library" exported="" name="recyclerview-v7-22.2.0" level="project" />
+ <orderEntry type="library" exported="" name="aboutlibraries-5.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.2.1" level="project" />
+ <orderEntry type="library" exported="" name="recyclerview-v7-22.2.1" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.2.1" level="project" />
+ <orderEntry type="library" exported="" name="cardview-v7-22.2.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-22.2.1" level="project" />
<orderEntry type="library" exported="" name="materialdrawer-3.0.8" level="project" />
- <orderEntry type="library" exported="" name="cardview-v7-22.2.0" level="project" />
<orderEntry type="module" module-name="ZmanLib" exported="" />
<orderEntry type="module" module-name="ZmanUtils" exported="" />
</component>
M ZehutYosef/build.gradle +2 -4
@@ 56,8 56,6 @@ android {
}
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 @@ dependencies {
}
/* 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' )
+
}
M common/gindin-android.gradle +7 -0
@@ 34,4 34,11 @@ android {
}
}
+}
+
+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