Skip to content

Commit

Permalink
Merge branch 'refs/heads/devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
henrichg committed Aug 10, 2024
2 parents 46bd153 + 4fa9ac5 commit 1c3b0f0
Show file tree
Hide file tree
Showing 157 changed files with 5,949 additions and 1,559 deletions.
3 changes: 3 additions & 0 deletions .idea/.gitignore

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions .idea/assetWizardSettings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 0 additions & 11 deletions .idea/other.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,7 @@ else if (worker.exit == -42) {
}


/** @noinspection RedundantThrows*/
public Command add(Command command) throws IOException {
if (this.close) {
throw new IllegalStateException(
Expand Down Expand Up @@ -317,6 +318,7 @@ private void closeQuietly(final Writer output) {
}
}

/** @noinspection RedundantThrows*/
public void close() throws IOException {
RootShell.log("Request to close shell!");

Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ buildscript {
// }
}
dependencies {
classpath 'com.android.tools.build:gradle:8.5.1'
classpath 'com.android.tools.build:gradle:8.5.2'
//classpath 'com.google.gms:google-services:4.3.4' // google-services plugin
//classpath 'com.google.firebase:firebase-crashlytics-gradle:2.3.0'
}
Expand Down
Loading

0 comments on commit 1c3b0f0

Please sign in to comment.