Merge remote-tracking branch 'upstream/master' into cqf

.devcontainer/devcontainer.json

@@ -7,7 +7,8 @@
 
   "features": {
     // https://github.com/akhildevelops/devcontainer-features/issues/7
-    "ghcr.io/akhildevelops/devcontainer-features/android-cli:0": {}
+    "ghcr.io/akhildevelops/devcontainer-features/android-cli:0": {},
+    "ghcr.io/devcontainers-contrib/features/pipenv:2": {}
 
     // https://github.com/CASL0/devcontainer-features/issues/4
     // "ghcr.io/casl0/devcontainer-features/android-sdk:1": {}

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,7 @@
 Fixes #[issue number]
 
 **Description**
-Clear and concise code change description. 
+Clear and concise code change description.
 
 **Alternative(s) considered**
 Have you considered any alternatives? And if so, why have you chosen the approach in this PR?
@@ -14,8 +14,9 @@ Choose one: (Bug fix | Feature | Documentation | Testing | Code health | Builds
 **Screenshots (if applicable)**
 
 **Checklist**
+
 - [ ] I have read and acknowledged the [Code of conduct](https://github.com/google/android-fhir/blob/master/CODE_OF_CONDUCT.md).
-- [ ] I have read the [Contributing](https://github.com/google/android-fhir/wiki/Contributing) page.
+- [ ] I have read the [Contributing](https://google.github.io/android-fhir/contrib/) page.
 - [ ] I have signed the Google [Individual CLA](https://cla.developers.google.com/about/google-individual), or I am covered by my company's [Corporate CLA](https://cla.developers.google.com/about/google-corporate ).
 - [ ] I have discussed my proposed solution with code owners in the linked issue(s) and we have agreed upon the general approach.
 - [ ] I have run `./gradlew spotlessApply` and `./gradlew spotlessCheck` to check my code follows the style guide of this project.

.github/workflows/build.yml

@@ -99,6 +99,16 @@ jobs:
       # This deploys content based on docs/ which ends up in site/
       # to https://google.github.io/android-fhir/ using GitHub Pages.
 
+      - name: Install Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: 3.11
+          cache: "pipenv"
+      - name: Install PipEnv
+        uses: tiagovrtr/actions-pipenv@v1
+        with:
+          pipenv-version: 2023.12.1
+
       - name: Build Docs Site
         # This 1st step intentionally runs not just on the main ("master") branch
         # but also for all pull requests. This serves to detect doc breakages.
@@ -108,7 +118,7 @@ jobs:
 
       - name: Setup GitHub Pages
         if: ${{ github.event_name == 'push' }}
-        uses: actions/configure-pages@v4
+        uses: actions/configure-pages@v5
 
       - name: Upload site/ directory as GitHub Pages artifact
         if: ${{ github.event_name == 'push' }}

.gitignore

@@ -90,3 +90,7 @@ lint/tmp/
 # Note: The docs/ directory is our SOURCE (in MD),
 # and the site/ directory is our TARGET (in HTML)
 site/
+# but the Dokka API Doc is generated into docs/
+# (which is slightly confusing, but helps mkdocs to validate links)
+# so we ignore that here, as it's a built artifact that should not be committed
+docs/use/api/*/**

.vscode/extensions.json

@@ -1,3 +1,7 @@
 {
-  "recommendations": ["davidanson.vscode-markdownlint"]
+  "recommendations": [
+    "davidanson.vscode-markdownlint",
+    "streetsidesoftware.code-spell-checker",
+    "redhat.vscode-yaml"
+  ]
 }

.vscode/settings.json

@@ -0,0 +1,32 @@
+{
+  "editor.autoIndent": "advanced",
+  "editor.insertSpaces": true,
+  "editor.indentSize": "tabSize",
+  "editor.tabSize": 2,
+
+  "files.insertFinalNewline": true,
+  "files.trimTrailingWhitespace": true,
+
+  // https://squidfunk.github.io/mkdocs-material/creating-your-site/
+  "yaml.schemas": {
+    "https://squidfunk.github.io/mkdocs-material/schema.json": "mkdocs.yaml"
+  },
+  "yaml.customTags": [
+    "!ENV scalar",
+    "!ENV sequence",
+    "!relative scalar",
+    "tag:yaml.org,2002:python/name:material.extensions.emoji.to_svg",
+    "tag:yaml.org,2002:python/name:material.extensions.emoji.twemoji",
+    "tag:yaml.org,2002:python/name:pymdownx.superfences.fence_code_format"
+  ],
+
+  "[yaml]": {
+    "editor.defaultFormatter": "redhat.vscode-yaml",
+    "diffEditor.ignoreTrimWhitespace": false,
+    "editor.quickSuggestions": {
+      "other": true,
+      "comments": false,
+      "strings": true
+    }
+  }
+}

CODEOWNERS

@@ -1,2 +1,14 @@
-# Owners of the repository
-* @google/android-fhir @santosh-pingle
+# This file lists people who get automatically added as Reviewers for Pull Requests.
+#
+# Note that we intentionally do NOT just include all committers here by using @google/android-fhir,
+# nor were we able to get it working using a group such as @google/android-fhir-reviewers;
+# details about why are described on https://github.com/google/android-fhir/issues/2320
+# and https://github.com/google/android-fhir/pull/2536.
+#
+# See https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
+
+# These people for *ALL* Pull Requests:
+* @aditya-07 @jingtang10 @MJ1998 @santosh-pingle 
+
+# These for anything documentation related:
+docs/* @vorburger

Contributing.md

@@ -22,7 +22,7 @@ use GitHub pull requests for this purpose. Consult
 [GitHub Help](https://help.github.com/articles/about-pull-requests/) for more
 information on using pull requests.
 
-See [Developer's Guide](https://github.com/google/android-fhir/wiki/Developer's-Guide) for more information.
+See [Contributor's Guide](https://google.github.io/android-fhir/contrib/) for more information.
 
 ## Community Guidelines
 

Pipfile

@@ -0,0 +1,14 @@
+[[source]]
+url = "https://pypi.org/simple"
+verify_ssl = true
+name = "pypi"
+
+[packages]
+mkdocs-material = "~=9.5.21"
+mkdocs-minify-plugin = "~=0.8.0"
+mkdocs-git-revision-date-localized-plugin = "~=1.2.5"
+
+[dev-packages]
+
+[requires]
+python_version = "3.11"