Opening times (#31)

Update mensa opening times
famoser · Oct 25, 2021 · c6335c7 · c6335c7
1 parent 3e4d92b
commit c6335c7
Show file tree

Hide file tree

Showing 7 changed files with 31 additions and 15 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,7 @@ addons:
     organization: "famoser-github"
     token:
       secure: "Ti5fuTMl+j23xVWDoqoeHMxfbDgvivlUZ4FdLvZH7LBhkvQ9tLvmhnzZksA3qUJxGcdK7NWWojHNEoDpw/riFuRb0dW4fCTkTaw9CfvspNkAiTWq/N5CYsPRThYFYzPzKTbTR9gTxJIJ9z/1ETmwecZRtkuCb+GpI5vuuvxlHsLBamnbvIP4xOF4hoI3xO0di1dVRmDDQTk9ke96QEaE2uLMsmyQOG7KXBvzGx0y0uwJQmwxdLhz3QL6qCbLaqKkR3XNq0mwGzbixblmVejbNlz7sn+UQovTTkPdcBVyXuBlhJqL8TWeNhUaW/9ZW4tVYyNVpUR0qywys1J1MaD+aHzAE0+Z93OtwofWyj24a6IgCSzOyvVP69/f/MnRrhDJj2nRVuBvuR5PsHqX5EJ6eUTglYKb2DvDD7DTMk5/Bxw/CWHYhaMiXPkzZ7PSJ5h2YRf64qdQGSGmAIl/6K2ckWiGbjYLAc92c15mm63xCouGpQ1ujjqVcyWbvGdrNeIQhBttfvtb/2UrRl8bjnEBUv8IAGEoMzBFXAJ6vAzJmWF5MnBNT4uPcoSRhq9RYTKJOUiSuFVyH/PCgPP0s2NO8ZXeLYDqQn2kWzWczJdxU25YZFn67Eg1A9dNv20hq6E7otoinP/jdZhlJk/BmznyfbWOcbGKGnAxOYvRY+yvsEM="
-  
+
 android:
   components:
     - build-tools-29.0.3
@@ -15,10 +15,16 @@ android:
     # Additional components
     - extra-google-m2repository
     - extra-android-m2repository
-
+
+jdk: openjdk11
+
+matrix:
+  allow_failures:
+    - jdk: openjdk11
+
 before_install:
   - yes | sdkmanager "platforms;android-29"
- 
+
 script:
   - ./gradlew build 
   - test $TRAVIS_PULL_REQUEST != "false" || ./gradlew sonarqube

diff --git a/app/build.gradle b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         applicationId "ch.famoser.mensa"
         minSdkVersion 21
         targetSdkVersion 29
-        versionCode 15
-        versionName "1.5.5"
+        versionCode 16
+        versionName "1.5.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     packagingOptions  {

diff --git a/app/src/main/assets/eth/locations.json b/app/src/main/assets/eth/locations.json
@@ -13,7 +13,7 @@
       {
         "id": "cc422893-0cd5-4250-9cca-3d23044083ac",
         "title": "Dozentenfoyer",
-        "mealTime": "11:00-14:00",
+        "mealTime": "11:30-13:45",
         "idSlug": 6,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/dozentenfoyer"
@@ -29,7 +29,7 @@
       {
         "id": "d4a1f423-7731-4bb0-8805-e1763e36150e",
         "title": "Foodtrailer",
-        "mealTime": "11:00-14:00",
+        "mealTime": "11:30-13:30",
         "idSlug": 9,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/foodtrailer-etz"
@@ -45,7 +45,7 @@
       {
         "id": "24e3a71a-ff05-4d20-a8c3-fa24f342c1dc",
         "title": "Mensa Polyterrasse",
-        "mealTime": "11:00-13:30",
+        "mealTime": "11:15-14:15",
         "idSlug": 12,
         "timeSlug": "lunch",
         "infoUrlSlug": "zentrum/mensa-polyterrasse"
@@ -82,31 +82,31 @@
       {
         "id": "0414ece7-d352-4495-99ec-51e9494c5d39",
         "title": "Alumni quattro Lounge",
-        "mealTime": "11:00-21:00",
+        "mealTime": "11:30-19:30",
         "idSlug": 15,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/alumni-quattro-lounge"
       },
       {
         "id": "c4e2a6fd-5c72-4f1c-8dcd-7d87f662f5f2",
         "title": "food market - green day",
-        "mealTime": "11:00-16:00",
+        "mealTime": "11:15-13:30",
         "idSlug": 19,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/food-market-green-day"
       },
       {
         "id": "e316e042-a99d-486e-872c-5e90b5092145",
         "title": "food market - grill bbQ",
-        "mealTime": "11:00-16:00",
+        "mealTime": "11:15-13:30",
         "idSlug": 20,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/food-market-grill-bbq"
       },
       {
         "id": "6bad9247-0c79-4423-9b16-33b8f74a87cd",
         "title": "food market - pizza pasta day",
-        "mealTime": "11:00-16:00",
+        "mealTime": "11:15-13:30",
         "idSlug": 18,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/food-market-pizza-pasta"
@@ -122,10 +122,18 @@
       {
         "id": "e01cded9-53aa-47c0-9ea5-3b5c85909e23",
         "title": "FUSION coffee",
-        "mealTime": "17:30-19:00",
+        "mealTime": "11:00-14:00",
         "idSlug": 22,
         "timeSlug": "lunch",
         "infoUrlSlug": "hoenggerberg/fusion-coffee"
+      },
+      {
+        "id": "e01cded9-53ea-47c0-9a25-2b5c85909e23",
+        "title": "Rice Up!",
+        "mealTime": "11:00-14:00",
+        "idSlug": 27,
+        "timeSlug": "lunch",
+        "infoUrlSlug": "hoenggerberg/rice-up"
       }
     ]
   }

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.1'
+        classpath 'com.android.tools.build:gradle:7.0.3'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/fastlane/metadata/android/de-DE/changelogs/16.txt b/fastlane/metadata/android/de-DE/changelogs/16.txt
@@ -0,0 +1 @@
+- Öffnungszeiten ETH Mensas angepasst
diff --git a/fastlane/metadata/android/en-US/changelogs/16.txt b/fastlane/metadata/android/en-US/changelogs/16.txt
@@ -0,0 +1 @@
+- new opening times for ETH mensas
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip