Merge branch 'master' into patch-2

JetBrains · Oct 2, 2023 · 1b72e9e · 1b72e9e
2 parents f90d747 + 36e810f
commit 1b72e9e
Show file tree

Hide file tree

Showing 48 changed files with 2,024 additions and 1,071 deletions.
diff --git a/.github/workflows/validate-universites-data.yml b/.github/workflows/validate-universites-data.yml
@@ -0,0 +1,19 @@
+name: Validate universities
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  validate_universities_data:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: chrisdickinson/setup-yq@latest
+        with:
+          yq-version: 'v4.9.5'
+      - run: |
+         jsonschema -i <(yq eval --tojson -j data/universities.yml) data/schemas/universities.json
+         echo "Universities data is valid!"
diff --git a/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt b/.teamcity/builds/kotlinlang/buidTypes/BuildReferenceDocs.kt
@@ -18,7 +18,7 @@ object BuildReferenceDocs : BuildType({
   """.trimIndent()
 
   params {
-    param("WEBHELP_FRONTEND_VERSION", "5.15.0")
+    param("WEBHELP_FRONTEND_VERSION", "6.4.0")
     param("WH_DOCS_PATH_REGEX", "docs")
     param("WH_PROJECT_NAME", "kotlin-reference")
   }

diff --git a/data/events.yml b/data/events.yml
@@ -1,3 +1,11 @@
+- lang: en
+  startDate: '2023-11-14'
+  endDate: '2023-11-14'
+  location: Brighton, UK
+  speaker : 'Andrey Breslav'
+  title : 'Brighton Kotlin'
+  subject : 'Kotlin: a bit of history'
+  url: https://www.meetup.com/Brighton-Kotlin/events/296107142
 - lang: de
   startDate: '2023-10-16'
   endDate: '2023-10-17'
@@ -11,8 +19,8 @@
   endDate: '2023-09-22'
   location: Amsterdam, Netherlands
   speaker : 'Garth Gilmour'
-  title : ''
-  subject : 'Kotlin Training Day'
+  title : 'Kotlin Training Day'
+  subject : 'Effective Ktor with Kotlin'
   url: https://pages.xebia.com/kotlin-training-day
 - lang: en
   startDate: '2023-09-14'

diff --git a/data/schemas/universities.json b/data/schemas/universities.json
@@ -0,0 +1,50 @@
+{
+  "$schema": "http://json-schema.org/draft-04/schema#",
+  "type": "array",
+  "items": {
+    "type": "object",
+    "properties": {
+      "title": {
+        "type": "string"
+      },
+      "location": {
+        "type": "string"
+      },
+      "courses": {
+        "type": "array",
+        "items": {
+          "type": "object",
+          "properties": {
+            "name": {
+              "type": "string"
+            },
+            "url": {
+              "type": [
+                "string",
+                "null"
+              ],
+              "format": "uri"
+            }
+          },
+          "required": ["name", "url"],
+          "additionalProperties": false
+        }
+      },
+      "geo": {
+        "type": "object",
+        "properties": {
+          "lat": {
+            "type": "number"
+          },
+          "lng": {
+            "type": "number"
+          }
+        },
+        "required": ["lat", "lng"],
+        "additionalProperties": false
+      }
+    },
+    "required": ["title", "location", "courses", "geo"],
+    "additionalProperties": false
+  }
+}