Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update november2023 #3692

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -110,9 +110,6 @@ android {
}
}

lintOptions {
disable 'ProtectedPermissions'
}

testOptions {
unitTests {
Expand All @@ -125,6 +122,10 @@ android {
useLegacyPackaging true
}
}
namespace 'com.termux'
lint {
disable 'ProtectedPermissions'
}

applicationVariants.all { variant ->
variant.outputs.all { output ->
Expand All @@ -142,8 +143,8 @@ android {

dependencies {
testImplementation "junit:junit:4.13.2"
testImplementation "org.robolectric:robolectric:4.10"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
testImplementation 'org.robolectric:robolectric:4.11.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
}

task versionName {
Expand Down
1 change: 0 additions & 1 deletion app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?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="com.termux"
android:installLocation="internalOnly"
android:sharedUserId="${TERMUX_PACKAGE_NAME}"
android:sharedUserLabel="@string/shared_user_label">
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ buildscript {
google()
}
dependencies {
classpath "com.android.tools.build:gradle:4.2.2"
classpath 'com.android.tools.build:gradle:7.4.2'
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
3 changes: 2 additions & 1 deletion terminal-emulator/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ android {
testOptions {
unitTests.returnDefaultValues = true
}
namespace 'com.termux.terminal'
}

tasks.withType(Test) {
Expand All @@ -50,7 +51,7 @@ tasks.withType(Test) {
}

dependencies {
implementation "androidx.annotation:annotation:1.3.0"
implementation 'androidx.annotation:annotation:1.7.0'
testImplementation "junit:junit:4.13.2"
}

Expand Down
2 changes: 1 addition & 1 deletion terminal-emulator/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest package="com.termux.terminal">
<manifest>
</manifest>
1 change: 1 addition & 0 deletions terminal-view/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ android {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
}
namespace 'com.termux.view'
}

dependencies {
Expand Down
2 changes: 1 addition & 1 deletion terminal-view/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
<manifest package="com.termux.view">
<manifest>
</manifest>
7 changes: 4 additions & 3 deletions termux-shared/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,14 @@ android {
path file('src/main/cpp/Android.mk')
}
}
namespace 'com.termux.shared'
}

dependencies {
testImplementation "junit:junit:4.13.2"
androidTestImplementation "androidx.test.ext:junit:1.1.3"
androidTestImplementation "androidx.test.espresso:espresso-core:3.4.0"
coreLibraryDesugaring "com.android.tools:desugar_jdk_libs:1.1.5"
androidTestImplementation 'androidx.test.ext:junit:1.1.5'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.4'
}

task sourceJar(type: Jar) {
Expand Down
3 changes: 1 addition & 2 deletions termux-shared/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.termux.shared">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<uses-permission android:name="android.permission.VIBRATE" />
</manifest>