Skip to content

Commit 480fb4e

Browse files
committed
Restructure project repository. Simplify Version name. Remove unused "calendar-widget" folder.
1 parent 55fbe3d commit 480fb4e

172 files changed

Lines changed: 33 additions & 43 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
1-
/bin
2-
/gen
3-
/target
4-
/build
1+
**/build
52
/.settings
63
/.gradle
74
/.idea
85
*.iml
6+
.bak
97
.project
108
.classpath
119
local.properties

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ script:
9393
# For testing one method only:
9494
# - adb shell am instrument -w -r -e debug false -e class org.andstatus.app.msg.ActAsUserTest#testActAsUser org.andstatus.app.tests/android.test.InstrumentationTestRunner
9595
- |
96-
adb shell am instrument -w -r -e debug false com.plusonelabs.calendar.tests/android.test.InstrumentationTestRunner |& tee build/adb-test.log
96+
adb shell am instrument -w -r -e debug false org.andstatus.todoagenda.tests/android.test.InstrumentationTestRunner |& tee build/adb-test.log
9797
retval=$?
9898
if [ $retval -ne 0 ]; then
9999
echo "error in adb, exit code: "$retval

README.md

Lines changed: 8 additions & 5 deletions
Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,23 @@
1-
buildscript {
2-
repositories {
3-
google()
4-
jcenter()
5-
}
6-
dependencies {
7-
classpath 'com.android.tools.build:gradle:3.2.1'
8-
classpath 'org.ajoberstar:grgit:2.1.0'
9-
}
10-
}
11-
121
apply plugin: 'com.android.application'
132

14-
repositories {
15-
google()
16-
jcenter()
17-
}
18-
193
dependencies {
204
implementation 'joda-time:joda-time:2.9.7'
215
implementation 'com.larswerkman:HoloColorPicker:1.5'
226
implementation 'com.android.support:appcompat-v7:27.1.1'
237
}
248

259
android {
26-
2710
compileSdkVersion 27
2811

2912
defaultConfig {
30-
versionName '1.10.1' + "-" + getCommitShortHash()
3113
versionCode getCommitCount()
14+
versionName '2.0.0' + "-" + versionCode
3215
minSdkVersion 15
3316
targetSdkVersion 27
3417

3518
testApplicationId "org.andstatus.todoagenda.tests"
3619
testInstrumentationRunner "android.test.InstrumentationTestRunner"
20+
project.ext.archivesBaseName = "TodoAgenda-$versionName".toString()
3721
}
3822

3923
buildTypes {
@@ -72,17 +56,6 @@ android {
7256
}
7357
}
7458

75-
static getCommitShortHash() {
76-
try {
77-
def git = org.ajoberstar.grgit.Grgit.open()
78-
def versionNameSuffix = "${git.head().getAbbreviatedId(7)}"
79-
git.close()
80-
return versionNameSuffix
81-
} catch (ignored) {
82-
return ""
83-
}
84-
}
85-
8659
static getCommitCount() {
8760
try {
8861
def git = org.ajoberstar.grgit.Grgit.open()

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

Lines changed: 0 additions & 2 deletions
This file was deleted.

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

File renamed without changes.

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

File renamed without changes.

app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/MultidayAllDayEventTest.java renamed to app/src/androidTest/java/org/andstatus/todoagenda/MultidayAllDayEventTest.java

File renamed without changes.

app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/MultidayEventTest.java renamed to app/src/androidTest/java/org/andstatus/todoagenda/MultidayEventTest.java

File renamed without changes.

app/calendar-widget/src/androidTest/java/org/andstatus/todoagenda/OngoingEventTest.java renamed to app/src/androidTest/java/org/andstatus/todoagenda/OngoingEventTest.java

File renamed without changes.

0 commit comments

Comments
 (0)