Skip to content

Commit

Permalink
Merge QuestCraf to Baseline (#34)
Browse files Browse the repository at this point in the history
  • Loading branch information
CADIndie authored Jan 17, 2024
1 parent ba61cc6 commit fbe80a0
Show file tree
Hide file tree
Showing 135 changed files with 1,795 additions and 1,833 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
name: Java CI with Gradle

on:
workflow_dispatch:
push:
branches: [ "master", "QuestCraft" ]
pull_request:
branches: [ "master", "QuestCraft" ]

Expand All @@ -28,9 +28,9 @@ jobs:
with:
java-version: '17'
distribution: 'temurin'
- name: make gradle wrapper executable
- name: Make Gradle wrapper executable
run: chmod +x ./gradlew
- name: Build with Gradle
uses: gradle/gradle-build-action@67421db6bd0bf253fb4bd25b31ebb98943c375e1
uses: gradle/gradle-build-action@v2
with:
arguments: build
13 changes: 11 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,17 @@

# Ignore Gradle build output directory
build

lib/build
# Misc files
.idea
local.properties
local.properties
.github
.DS_Store
*.iml
*.ipr
*.iws
.settings
.vscode
bin
.classpath
.project
3 changes: 0 additions & 3 deletions .idea/.gitignore

This file was deleted.

1 change: 0 additions & 1 deletion .idea/.name

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/compiler.xml

This file was deleted.

7 changes: 0 additions & 7 deletions .idea/discord.xml

This file was deleted.

21 changes: 0 additions & 21 deletions .idea/gradle.xml

This file was deleted.

30 changes: 0 additions & 30 deletions .idea/jarRepositories.xml

This file was deleted.

13 changes: 0 additions & 13 deletions .idea/misc.xml

This file was deleted.

6 changes: 0 additions & 6 deletions .idea/vcs.xml

This file was deleted.

24 changes: 24 additions & 0 deletions .run/Pojlib [build].run.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Pojlib [build]" type="GradleRunConfiguration" factoryName="Gradle" nameIsGenerated="true">
<ExternalSystemSettings>
<option name="executionName" />
<option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="externalSystemIdString" value="GRADLE" />
<option name="scriptParameters" value="" />
<option name="taskDescriptions">
<list />
</option>
<option name="taskNames">
<list>
<option value="build" />
</list>
</option>
<option name="vmOptions" />
</ExternalSystemSettings>
<ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
<ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
<DebugAllEnabled>false</DebugAllEnabled>
<ForceTestExec>false</ForceTestExec>
<method v="2" />
</configuration>
</component>
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,14 @@ Please ensure your code follows the language's naming conventions, here's a list
Make sure your pull request describes exactly what the code does and explains why you're making the pull request!



## Credits & Third Party Components
### Developers:
* @MrNavaStar | Lead Feature Implementor

* @thejudge156 | Senior Maintainer
* [@TheJudge156](https://github.com/thejudge156) | Senior Maintainer

* [@CADIndie](https://github.com/CADIndie) | Jr. Maintainer

* @CADIndie | Jr. Maintainer
* [@MrNavaStar](https://github.com/MrNavaStar) | Previous Main Feature Implementor

### Components:
- [PojavLauncher](https://github.com/PojavLauncherTeam/PojavLauncher) (Pojlib Base application): [GNU GPLv3](https://github.com/khanhduytran0/PojavLauncher/blob/master/LICENSE).
Expand Down
21 changes: 10 additions & 11 deletions lib/build.gradle.kts → build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
plugins {
id("com.android.library")
id("org.jetbrains.kotlin.android")
id("com.android.library") version("7.4.0")
}

android {
ndkVersion = "25.2.9519653"
compileSdkVersion = "android-31"
ndkVersion = "26.1.10909125"
compileSdkVersion = "android-32"
defaultConfig {
minSdkVersion(31)
minSdkVersion(32)
}

buildTypes {
Expand Down Expand Up @@ -37,19 +36,19 @@ dependencies {
}

dependencies {
implementation("org.jetbrains:annotations:24.0.0")
implementation("org.jetbrains:annotations:24.0.1")
implementation("com.google.code.gson:gson:2.10.1")
implementation("org.json:json:20220924")
implementation("commons-io:commons-io:2.11.0")
implementation("commons-io:commons-io:2.13.0")
implementation("commons-codec:commons-codec:1.15")
implementation("androidx.legacy:legacy-support-v4:1.0.0")
implementation("androidx.preference:preference:1.2.0")
implementation("androidx.preference:preference-ktx:1.2.1")
implementation("androidx.appcompat:appcompat:1.6.1")
implementation("androidx.legacy:legacy-preference-v14:1.0.0")
implementation("com.google.android.material:material:1.8.0")
implementation("androidx.annotation:annotation:1.6.0")
implementation("com.microsoft.azure:msal4j:1.13.9")
implementation("androidx.browser:browser:1.5.0")
implementation("androidx.annotation:annotation:1.7.1")
implementation("com.microsoft.azure:msal4j:1.14.0")
implementation("androidx.browser:browser:1.7.0")
implementation("blank:unity-classes")
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
}
13 changes: 0 additions & 13 deletions build.gradle.kts

This file was deleted.

Loading

0 comments on commit fbe80a0

Please sign in to comment.