-
-
Notifications
You must be signed in to change notification settings - Fork 12
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'development' into trunk
- Loading branch information
Showing
195 changed files
with
4,082 additions
and
4,011 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| // For format details, see https://aka.ms/vscode-remote/devcontainer.json or this file's README at: | ||
| // https://github.com/microsoft/vscode-dev-containers/tree/v0.195.0/containers/java | ||
| { | ||
| "name": "Java", | ||
| "build": { | ||
| "dockerfile": "Dockerfile", | ||
| "args": { | ||
| // Update the VARIANT arg to pick a Java version: 8, 11, 17 | ||
| // Append -bullseye or -buster to pin to an OS version. | ||
| // Use the -bullseye variants on local arm64/Apple Silicon. | ||
| "VARIANT": "17-bullseye", | ||
| // Options | ||
| "INSTALL_MAVEN": "true", | ||
| "MAVEN_VERSION": "3.8.5", | ||
| "INSTALL_GRADLE": "false", | ||
| "NODE_VERSION": "lts/*" | ||
| } | ||
| }, | ||
|
|
||
| // Configure tool-specific properties. | ||
| "customizations": { | ||
| // Configure properties specific to VS Code. | ||
| "vscode": { | ||
| // Set *default* container specific settings.json values on container create. | ||
| "settings": { | ||
| "maven.executable.path": "/usr/local/sdkman/candidates/maven/current/bin/mvn" | ||
| }, | ||
|
|
||
| // Add the IDs of extensions you want installed when the container is created. | ||
| "extensions": [ | ||
| "vscjava.vscode-java-pack" | ||
| ] | ||
| } | ||
| }, | ||
|
|
||
| // Use 'forwardPorts' to make a list of ports inside the container available locally. | ||
| // "forwardPorts": [], | ||
|
|
||
| // Use 'postCreateCommand' to run commands after the container is created. | ||
| // "postCreateCommand": "java -version", | ||
|
|
||
| // Uncomment to connect as a non-root user. See https://aka.ms/vscode-remote/containers/non-root. | ||
| "remoteUser": "vscode" | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,21 @@ | ||
| # To get started with Dependabot version updates, you'll need to specify which | ||
| # package ecosystems to update and where the package manifests are located. | ||
| # Please see the documentation for all configuration options: | ||
| # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates | ||
|
|
||
| version: 2 | ||
| updates: | ||
| - package-ecosystem: "gradle" # See documentation for possible values | ||
| directory: "/" # Location of package manifests | ||
| - package-ecosystem: gradle | ||
| directory: "/" | ||
| schedule: | ||
| interval: monthly | ||
| open-pull-requests-limit: 10 | ||
| - package-ecosystem: "devcontainers" | ||
| directory: "/" | ||
| schedule: | ||
| interval: "weekly" | ||
| interval: monthly | ||
| open-pull-requests-limit: 10 | ||
| - package-ecosystem: "github-actions" | ||
| directory: "/" | ||
| schedule: | ||
| interval: monthly | ||
| open-pull-requests-limit: 10 | ||
| reviewers: | ||
| - FahadSaleem | ||
| assignees: | ||
| - FahadSaleem |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,30 +1,31 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| package="rocks.poopjournal.vacationdays" | ||
| xmlns:tools="http://schemas.android.com/tools"> | ||
| <!-- <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />--> | ||
| <!-- <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />--> | ||
| <!-- <uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />--> | ||
|
|
||
| <application | ||
| tools:replace="android:allowBackup" | ||
| android:allowBackup="true" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:roundIcon="@drawable/logo" | ||
| android:supportsRtl="true" | ||
| android:theme="@style/Theme.MyVacationDays2" | ||
| android:dataExtractionRules="@xml/data_extraction_rules"> | ||
|
|
||
| <activity android:name="rocks.poopjournal.vacationdays.SettingsActivity"></activity> | ||
| <activity android:name="rocks.poopjournal.vacationdays.DatePicker" /> | ||
| <activity android:name="rocks.poopjournal.vacationdays.About" /> | ||
| <activity android:name="rocks.poopjournal.vacationdays.MainActivity" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| </application> | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| package="rocks.poopjournal.vacationdays"> | ||
|
|
||
| <application | ||
| android:name=".VacationApplication" | ||
| android:allowBackup="true" | ||
| android:dataExtractionRules="@xml/data_extraction_rules" | ||
| android:icon="@mipmap/ic_launcher" | ||
| android:label="@string/app_name" | ||
| android:roundIcon="@drawable/logo" | ||
| android:supportsRtl="true" | ||
| android:theme="@style/Theme.MyVacationDays2" | ||
| tools:replace="android:allowBackup"> | ||
|
|
||
| <activity | ||
| android:name=".MainActivity2" | ||
| android:exported="true"> | ||
| <intent-filter> | ||
| <action android:name="android.intent.action.MAIN" /> | ||
|
|
||
| <category android:name="android.intent.category.LAUNCHER" /> | ||
| </intent-filter> | ||
| </activity> | ||
| <service android:name="androidx.appcompat.app.AppLocalesMetadataHolderService" android:enabled="false" android:exported="false"> | ||
| <meta-data android:name="autoStoreLocales" android:value="true"/> | ||
| </service> | ||
| </application> | ||
|
|
||
| </manifest> |
Oops, something went wrong.