Restructure project repository. Simplify Version name. Remove unused "calendar-widget" folder.

Author: yvolk

app/calendar-widget/.gitignore .gitignore

@@ -1,11 +1,9 @@
-/bin
-/gen
-/target
-/build
+**/build
 /.settings
 /.gradle
 /.idea
 *.iml
+.bak
 .project
 .classpath
 local.properties

.travis.yml

@@ -93,7 +93,7 @@ script:
   # For testing one method only:
   # - adb shell am instrument -w -r -e debug false -e class org.andstatus.app.msg.ActAsUserTest#testActAsUser org.andstatus.app.tests/android.test.InstrumentationTestRunner
   - |
-    adb shell am instrument -w -r -e debug false com.plusonelabs.calendar.tests/android.test.InstrumentationTestRunner |& tee build/adb-test.log
+    adb shell am instrument -w -r -e debug false org.andstatus.todoagenda.tests/android.test.InstrumentationTestRunner |& tee build/adb-test.log
     retval=$?
     if [ $retval -ne 0 ]; then
       echo "error in adb, exit code: "$retval

README.md

@@ -1,39 +1,23 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.1'
-        classpath 'org.ajoberstar:grgit:2.1.0'
-    }
-}
-
 apply plugin: 'com.android.application'
 
-repositories {
-    google()
-    jcenter()
-}
-
 dependencies {
     implementation 'joda-time:joda-time:2.9.7'
     implementation 'com.larswerkman:HoloColorPicker:1.5'
     implementation 'com.android.support:appcompat-v7:27.1.1'
 }
 
 android {
-
     compileSdkVersion 27
 
     defaultConfig {
-        versionName '1.10.1' + "-" + getCommitShortHash()
         versionCode getCommitCount()
+        versionName '2.0.0' + "-" + versionCode
         minSdkVersion 15
         targetSdkVersion 27
 
         testApplicationId "org.andstatus.todoagenda.tests"
         testInstrumentationRunner "android.test.InstrumentationTestRunner"
+        project.ext.archivesBaseName = "TodoAgenda-$versionName".toString()
     }
 
     buildTypes {
@@ -72,17 +56,6 @@ android {
     }
 }
 
-static getCommitShortHash() {
-    try {
-        def git = org.ajoberstar.grgit.Grgit.open()
-        def versionNameSuffix = "${git.head().getAbbreviatedId(7)}"
-        git.close()
-        return versionNameSuffix
-    } catch (ignored) {
-        return ""
-    }
-}
-
 static getCommitCount() {
     try {
         def git = org.ajoberstar.grgit.Grgit.open()

app/calendar-widget/build.gradle app/build.gradle

@@ -6,7 +6,7 @@
         android:persistent="false">
         <intent
             android:action="android.intent.action.VIEW"
-            android:data="https://github.com/plusonelabs/calendar-widget" />
+            android:data="https://github.com/andstatus/todoagenda" />
     </Preference>
     <Preference
         android:key="feedbackPlayStore"

app/calendar-widget/src/main/.gitignore

@@ -0,0 +1,17 @@
+buildscript {
+    repositories {
+        google()
+        jcenter()
+    }
+
+    dependencies {
+        classpath 'com.android.tools.build:gradle:3.2.1'
+        classpath 'org.ajoberstar:grgit:2.1.0'
+    }
+}
+allprojects {
+    repositories {
+        google()
+        jcenter()
+    }
+}

app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/BirthdayTest.java app/src/androidTest/java/org/andstatus/todoagenda/BirthdayTest.java

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<code_scheme name="plusonelabs">
+<code_scheme name="todoagenda">
   <option name="LINE_SEPARATOR" value="&#10;" />
   <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
   <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="2" />

app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/IllegalInstantDueToTimeZoneTransitionTest.java app/src/androidTest/java/org/andstatus/todoagenda/IllegalInstantDueToTimeZoneTransitionTest.java

@@ -0,0 +1 @@
+include ':app'