Commit Graph

104 Commits

Author SHA1 Message Date
daniel oeh
cc052e91ad Merge branch 'migration' into develop
Non-GUI classes have been moved into the 'core' project in order to allow AntennaPod SP to reference it as a subproject.

Conflicts:
	app/src/main/AndroidManifest.xml
	build.gradle
	core/src/main/java/de/danoeh/antennapod/core/service/playback/PlaybackService.java
	core/src/main/java/de/danoeh/antennapod/core/syndication/namespace/NSSimpleChapters.java
	core/src/main/java/de/danoeh/antennapod/core/util/ChapterUtils.java
	gradle/wrapper/gradle-wrapper.properties
	pom.xml
2014-10-24 20:40:07 +02:00
daniel oeh
1995a18a21 Updated build files 2014-10-14 18:41:13 +02:00
daniel oeh
658559699f Moved core classes into subproject 2014-10-11 17:43:07 +02:00
daniel oeh
072639b5b2 Changed project structure
Switched from custom layout to standard gradle project structure
2014-09-17 20:51:45 +02:00