diff --git a/build.gradle b/build.gradle index e54215a4b..335826fa8 100644 --- a/build.gradle +++ b/build.gradle @@ -1,35 +1,31 @@ -apply plugin: 'java-library' - allprojects { + apply plugin: 'java-library' sourceCompatibility = 1.7 targetCompatibility = 1.7 -} -repositories { - jcenter() -} + version 'v0.12.0' -dependencies { - implementation 'com.grack:nanojson:1.1' - implementation 'org.jsoup:jsoup:1.9.2' - implementation 'org.mozilla:rhino:1.7.7.1' - implementation 'com.github.spotbugs:spotbugs-annotations:3.1.0' - testImplementation 'junit:junit:4.12' -} - -task sourcesJar(type: Jar, dependsOn: classes) { - classifier = 'sources' - from sourceSets.main.allSource -} - -artifacts { - archives sourcesJar -} - -tasks.withType(Test) { - testLogging { - events "skipped", "failed" - showStandardStreams = true - exceptionFormat = 'full' + repositories { + jcenter() } -} \ No newline at end of file +} + +subprojects { + task sourcesJar(type: Jar, dependsOn: classes) { + classifier = 'sources' + from sourceSets.main.allSource + } + + tasks.withType(Test) { + testLogging { + events "skipped", "failed" + showStandardStreams = true + exceptionFormat = 'full' + } + } + + artifacts { + archives sourcesJar + } +} + diff --git a/extractor/build.gradle b/extractor/build.gradle new file mode 100644 index 000000000..33498cbe8 --- /dev/null +++ b/extractor/build.gradle @@ -0,0 +1,10 @@ +dependencies { + implementation project(':timeago-parser') + + implementation 'com.grack:nanojson:1.1' + implementation 'org.jsoup:jsoup:1.9.2' + implementation 'org.mozilla:rhino:1.7.7.1' + implementation 'com.github.spotbugs:spotbugs-annotations:3.1.0' + + testImplementation 'junit:junit:4.12' +} \ No newline at end of file diff --git a/src/main/java/org/schabi/newpipe/extractor/Collector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Collector.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/Collector.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/Collector.java diff --git a/src/main/java/org/schabi/newpipe/extractor/Downloader.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Downloader.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/Downloader.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/Downloader.java diff --git a/src/main/java/org/schabi/newpipe/extractor/Extractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/Extractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/Extractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/Info.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Info.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/Info.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/Info.java diff --git a/src/main/java/org/schabi/newpipe/extractor/InfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/InfoItem.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/InfoItem.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/InfoItem.java diff --git a/src/main/java/org/schabi/newpipe/extractor/InfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/InfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/InfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/InfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/InfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/InfoItemsCollector.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/InfoItemsCollector.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/InfoItemsCollector.java diff --git a/src/main/java/org/schabi/newpipe/extractor/ListExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/ListExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/ListExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/ListExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/ListInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/ListInfo.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/ListInfo.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/ListInfo.java diff --git a/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java b/extractor/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/MediaFormat.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/MediaFormat.java diff --git a/src/main/java/org/schabi/newpipe/extractor/NewPipe.java b/extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/NewPipe.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/NewPipe.java diff --git a/src/main/java/org/schabi/newpipe/extractor/ServiceList.java b/extractor/src/main/java/org/schabi/newpipe/extractor/ServiceList.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/ServiceList.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/ServiceList.java diff --git a/src/main/java/org/schabi/newpipe/extractor/StreamingService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java similarity index 99% rename from src/main/java/org/schabi/newpipe/extractor/StreamingService.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java index 11e6e9b1a..7fb667576 100644 --- a/src/main/java/org/schabi/newpipe/extractor/StreamingService.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/StreamingService.java @@ -8,7 +8,6 @@ import org.schabi.newpipe.extractor.search.SearchEngine; import org.schabi.newpipe.extractor.stream.StreamExtractor; import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; -import java.io.IOException; import java.util.Collections; import java.util.List; diff --git a/src/main/java/org/schabi/newpipe/extractor/Subtitles.java b/extractor/src/main/java/org/schabi/newpipe/extractor/Subtitles.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/Subtitles.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/Subtitles.java diff --git a/src/main/java/org/schabi/newpipe/extractor/SuggestionExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/SuggestionExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/SuggestionExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/SuggestionExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/UrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/UrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/UrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/UrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfo.java diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItem.java diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/channel/ChannelInfoItemsCollector.java diff --git a/src/main/java/org/schabi/newpipe/extractor/exceptions/ContentNotAvailableException.java b/extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ContentNotAvailableException.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/exceptions/ContentNotAvailableException.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ContentNotAvailableException.java diff --git a/src/main/java/org/schabi/newpipe/extractor/exceptions/ExtractionException.java b/extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ExtractionException.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/exceptions/ExtractionException.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ExtractionException.java diff --git a/src/main/java/org/schabi/newpipe/extractor/exceptions/FoundAdException.java b/extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/FoundAdException.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/exceptions/FoundAdException.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/FoundAdException.java diff --git a/src/main/java/org/schabi/newpipe/extractor/exceptions/ParsingException.java b/extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ParsingException.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/exceptions/ParsingException.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ParsingException.java diff --git a/src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java b/extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/exceptions/ReCaptchaException.java diff --git a/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskInfo.java diff --git a/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java b/extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/kiosk/KioskList.java diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfo.java diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItem.java diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemsCollector.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemsCollector.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/playlist/PlaylistInfoItemsCollector.java diff --git a/src/main/java/org/schabi/newpipe/extractor/search/InfoItemsSearchCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/search/InfoItemsSearchCollector.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/search/InfoItemsSearchCollector.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/search/InfoItemsSearchCollector.java diff --git a/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java b/extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchEngine.java diff --git a/src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java b/extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/search/SearchResult.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelper.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngine.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java similarity index 99% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java index 383c0a810..b65be7b23 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudService.java @@ -12,8 +12,6 @@ import org.schabi.newpipe.extractor.search.SearchEngine; import org.schabi.newpipe.extractor.stream.StreamExtractor; import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; -import java.io.IOException; - import static java.util.Collections.singletonList; import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.AUDIO; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/ItagItem.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeParsingHelper.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java similarity index 99% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java index 74f395024..eff7adc1e 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractor.java @@ -16,7 +16,6 @@ import org.schabi.newpipe.extractor.playlist.PlaylistExtractor; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import org.schabi.newpipe.extractor.stream.StreamInfoItemsCollector; import org.schabi.newpipe.extractor.stream.StreamType; -import org.schabi.newpipe.extractor.utils.Parser; import org.schabi.newpipe.extractor.utils.Utils; import javax.annotation.Nonnull; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngine.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java similarity index 99% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java index 5e66e124e..2ac5dff29 100644 --- a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java +++ b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeService.java @@ -12,8 +12,6 @@ import org.schabi.newpipe.extractor.search.SearchEngine; import org.schabi.newpipe.extractor.stream.StreamExtractor; import org.schabi.newpipe.extractor.subscription.SubscriptionExtractor; -import java.io.IOException; - import static java.util.Arrays.asList; import static org.schabi.newpipe.extractor.StreamingService.ServiceInfo.MediaCapability.*; diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandler.java b/extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandler.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandler.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandler.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/AudioStream.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/AudioStream.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/AudioStream.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/AudioStream.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/Stream.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/Stream.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/Stream.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/Stream.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfo.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItem.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamInfoItemsCollector.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/StreamType.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamType.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/StreamType.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/StreamType.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/SubtitlesFormat.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/SubtitlesFormat.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/SubtitlesFormat.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/SubtitlesFormat.java diff --git a/src/main/java/org/schabi/newpipe/extractor/stream/VideoStream.java b/extractor/src/main/java/org/schabi/newpipe/extractor/stream/VideoStream.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/stream/VideoStream.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/stream/VideoStream.java diff --git a/src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionExtractor.java b/extractor/src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionExtractor.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionExtractor.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionExtractor.java diff --git a/src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionItem.java b/extractor/src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionItem.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionItem.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/subscription/SubscriptionItem.java diff --git a/src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/utils/DashMpdParser.java diff --git a/src/main/java/org/schabi/newpipe/extractor/utils/ExtractorHelper.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/ExtractorHelper.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/utils/ExtractorHelper.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/utils/ExtractorHelper.java diff --git a/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/utils/Parser.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/utils/Parser.java diff --git a/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java b/extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java similarity index 100% rename from src/main/java/org/schabi/newpipe/extractor/utils/Utils.java rename to extractor/src/main/java/org/schabi/newpipe/extractor/utils/Utils.java diff --git a/src/test/java/org/schabi/newpipe/Downloader.java b/extractor/src/test/java/org/schabi/newpipe/Downloader.java similarity index 100% rename from src/test/java/org/schabi/newpipe/Downloader.java rename to extractor/src/test/java/org/schabi/newpipe/Downloader.java diff --git a/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java b/extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/ExtractorAsserts.java diff --git a/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/NewPipeTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/BaseChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/BaseChannelExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/BaseChannelExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/BaseChannelExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/BaseExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/BaseExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/BaseExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/BaseExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/BaseListExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/BaseListExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/BaseListExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/BaseListExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/BasePlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/BasePlaylistExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/BasePlaylistExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/BasePlaylistExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/DefaultTests.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultTests.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/DefaultTests.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/DefaultTests.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/BaseSoundcloudSearchTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/BaseSoundcloudSearchTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/BaseSoundcloudSearchTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/BaseSoundcloudSearchTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChannelExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandlerTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandlerTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandlerTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandlerTest.java index 76d918461..e805b297f 100644 --- a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandlerTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudChartsUrlIdHandlerTest.java @@ -1,14 +1,14 @@ package org.schabi.newpipe.extractor.services.soundcloud; -import static junit.framework.TestCase.assertFalse; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import org.junit.BeforeClass; import org.junit.Test; import org.schabi.newpipe.Downloader; import org.schabi.newpipe.extractor.NewPipe; +import static junit.framework.TestCase.assertFalse; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + /** * Test for {@link SoundcloudChartsUrlIdHandler} */ diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelperTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelperTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelperTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudParsingHelperTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudPlaylistExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineAllTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineChannelTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineChannelTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineChannelTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineChannelTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEnginePlaylistTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEnginePlaylistTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEnginePlaylistTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEnginePlaylistTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSearchEngineStreamTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamExtractorDefaultTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudStreamUrlIdHandlerTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSubscriptionExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/soundcloud/SoundcloudSuggestionExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/BaseYoutubeSearchTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/BaseYoutubeSearchTest.java similarity index 98% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/BaseYoutubeSearchTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/BaseYoutubeSearchTest.java index 41ef15170..e643a986b 100644 --- a/src/test/java/org/schabi/newpipe/extractor/services/youtube/BaseYoutubeSearchTest.java +++ b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/BaseYoutubeSearchTest.java @@ -8,7 +8,6 @@ import org.schabi.newpipe.extractor.search.SearchResult; import org.schabi.newpipe.extractor.stream.StreamInfoItem; import static org.junit.Assert.*; -import static org.junit.Assert.assertTrue; import static org.schabi.newpipe.extractor.ExtractorAsserts.assertIsSecureUrl; public abstract class BaseYoutubeSearchTest { diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandlerTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandlerTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandlerTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeChannelUrlIdHandlerTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubePlaylistExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineAllTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineChannelTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineChannelTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineChannelTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineChannelTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEnginePlaylistTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEnginePlaylistTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEnginePlaylistTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEnginePlaylistTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSearchEngineStreamTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeServiceTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorControversialTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorControversialTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorControversialTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorControversialTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorDefaultTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamExtractorRestrictedTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeStreamUrlIdHandlerTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSubscriptionExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeSuggestionExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractorTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractorTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractorTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingExtractorTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingKioskInfoTest.java diff --git a/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandlerTest.java b/extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandlerTest.java similarity index 100% rename from src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandlerTest.java rename to extractor/src/test/java/org/schabi/newpipe/extractor/services/youtube/YoutubeTrendingUrlIdHandlerTest.java diff --git a/src/test/resources/youtube_export_test.xml b/extractor/src/test/resources/youtube_export_test.xml similarity index 100% rename from src/test/resources/youtube_export_test.xml rename to extractor/src/test/resources/youtube_export_test.xml diff --git a/settings.gradle b/settings.gradle index f897ec98f..725f65056 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -include ':' -rootProject.name = 'NewPipeExtractor' +include 'extractor', 'timeago-parser' +rootProject.name = 'NewPipeExtractor' \ No newline at end of file diff --git a/timeago-parser/build.gradle b/timeago-parser/build.gradle new file mode 100644 index 000000000..8c94acb92 --- /dev/null +++ b/timeago-parser/build.gradle @@ -0,0 +1,3 @@ +dependencies { + testImplementation 'junit:junit:4.12' +} \ No newline at end of file