Skip to content

Commit 7825414

Browse files
doppem15doppem15
committed
IDE-287 Fix build errors in build variants
1 parent 6dc83b6 commit 7825414

File tree

6 files changed

+31
-32
lines changed

6 files changed

+31
-32
lines changed

‎catroid/src/createAtSchool/java/org/catrobat/catroid/common/FlavoredConstants.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,12 +53,12 @@ public final class FlavoredConstants {
5353

5454
// Media Library:
5555
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
56-
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
57-
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
58-
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
59-
public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape";
60-
public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds";
61-
public static final String PRIVACY_POLICY_URL = "https://catrob.at/createatschoolprivacy";
56+
public static final String CATROBAT_BASE_URL = "https://catrobat.org/";
57+
public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/";
58+
public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/";
59+
public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/";
60+
public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/";
61+
public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy";
6262

6363
private FlavoredConstants() {
6464
throw new AssertionError("No.");

‎catroid/src/embroideryDesigner/java/org/catrobat/catroid/common/FlavoredConstants.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public final class FlavoredConstants {
5353

5454
// Media Library:
5555
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
56-
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
57-
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
58-
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
59-
public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape";
60-
public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds";
56+
public static final String CATROBAT_BASE_URL = "https://catrobat.org/";
57+
public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/";
58+
public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/";
59+
public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/";
60+
public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/";
6161
public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy";
6262

6363
private FlavoredConstants() {

‎catroid/src/lunaAndCat/java/org/catrobat/catroid/common/FlavoredConstants.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public final class FlavoredConstants {
5353

5454
// Media Library:
5555
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
56-
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
57-
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
58-
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
59-
public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape";
60-
public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds";
56+
public static final String CATROBAT_BASE_URL = "https://catrobat.org/";
57+
public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/";
58+
public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/";
59+
public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/";
60+
public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/";
6161
public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy";
6262

6363
private FlavoredConstants() {

‎catroid/src/mindstorms/java/org/catrobat/catroid/common/FlavoredConstants.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,13 +53,12 @@ public final class FlavoredConstants {
5353

5454
// Media Library:
5555
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
56-
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
57-
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
58-
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
59-
public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape";
60-
public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds";
56+
public static final String CATROBAT_BASE_URL = "https://catrobat.org/";
57+
public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/";
58+
public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/";
59+
public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/";
60+
public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/";
6161
public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy";
62-
6362
private FlavoredConstants() {
6463
throw new AssertionError("No.");
6564
}

‎catroid/src/phiro/java/org/catrobat/catroid/common/FlavoredConstants.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public final class FlavoredConstants {
5353

5454
// Media Library:
5555
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
56-
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
57-
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
58-
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
59-
public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape";
60-
public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds";
56+
public static final String CATROBAT_BASE_URL = "https://catrobat.org/";
57+
public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/";
58+
public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/";
59+
public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/";
60+
public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/";
6161
public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy";
6262

6363
private FlavoredConstants() {

‎catroid/src/pocketCodeBeta/java/org/catrobat/catroid/common/FlavoredConstants.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ public final class FlavoredConstants {
5353

5454
// Media Library:
5555
public static final String LIBRARY_BASE_URL = MAIN_URL_HTTPS + "/app/download-media/";
56-
public static final String LIBRARY_LOOKS_URL = BASE_URL_HTTPS + "media-library/looks";
57-
public static final String LIBRARY_OBJECT_URL = BASE_URL_HTTPS + "media-library/objects";
58-
public static final String LIBRARY_BACKGROUNDS_URL_PORTRAIT = BASE_URL_HTTPS + "media-library/backgrounds-portrait";
59-
public static final String LIBRARY_BACKGROUNDS_URL_LANDSCAPE = BASE_URL_HTTPS + "media-library/backgrounds-landscape";
60-
public static final String LIBRARY_SOUNDS_URL = BASE_URL_HTTPS + "media-library/sounds";
56+
public static final String CATROBAT_BASE_URL = "https://catrobat.org/";
57+
public static final String CATROBAT_CONTENT_DOWNLOAD_URL = CATROBAT_BASE_URL + "wp-content/";
58+
public static final String CATROBAT_CONTENT_LOOKS_URL = CATROBAT_BASE_URL + "figures-download/";
59+
public static final String CATROBAT_CONTENT_SOUNDS_URL = CATROBAT_BASE_URL + "sounds-download/";
60+
public static final String CATROBAT_CONTENT_BACKGROUNDS_URL = CATROBAT_BASE_URL + "backgrounds-download/";
6161
public static final String PRIVACY_POLICY_URL = "https://catrob.at/privacypolicy";
6262

6363
private FlavoredConstants() {

0 commit comments

Comments
 (0)