diff --git a/app/build.gradle b/app/build.gradle index 3df93fef10..155d148fdb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -110,9 +110,6 @@ android { } } - lintOptions { - disable 'ProtectedPermissions' - } testOptions { unitTests { @@ -125,6 +122,10 @@ android { useLegacyPackaging true } } + namespace 'com.termux' + lint { + disable 'ProtectedPermissions' + } applicationVariants.all { variant -> variant.outputs.all { output -> @@ -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 { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4e95702bc3..14e9b0c518 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ diff --git a/build.gradle b/build.gradle index 80ddd4bde1..fd00105a4f 100644 --- a/build.gradle +++ b/build.gradle @@ -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' } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a0f7639f7d..2ec77e51a9 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/terminal-emulator/build.gradle b/terminal-emulator/build.gradle index afc57e9f7e..624492addd 100644 --- a/terminal-emulator/build.gradle +++ b/terminal-emulator/build.gradle @@ -41,6 +41,7 @@ android { testOptions { unitTests.returnDefaultValues = true } + namespace 'com.termux.terminal' } tasks.withType(Test) { @@ -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" } diff --git a/terminal-emulator/src/main/AndroidManifest.xml b/terminal-emulator/src/main/AndroidManifest.xml index a293cb643b..bdae66c8f5 100644 --- a/terminal-emulator/src/main/AndroidManifest.xml +++ b/terminal-emulator/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/terminal-view/build.gradle b/terminal-view/build.gradle index d603da2880..c7ab5097d6 100644 --- a/terminal-view/build.gradle +++ b/terminal-view/build.gradle @@ -26,6 +26,7 @@ android { sourceCompatibility JavaVersion.VERSION_1_8 targetCompatibility JavaVersion.VERSION_1_8 } + namespace 'com.termux.view' } dependencies { diff --git a/terminal-view/src/main/AndroidManifest.xml b/terminal-view/src/main/AndroidManifest.xml index f2b0725df4..bdae66c8f5 100644 --- a/terminal-view/src/main/AndroidManifest.xml +++ b/terminal-view/src/main/AndroidManifest.xml @@ -1,2 +1,2 @@ - + diff --git a/termux-shared/build.gradle b/termux-shared/build.gradle index d44a8e4573..8b79305fcc 100644 --- a/termux-shared/build.gradle +++ b/termux-shared/build.gradle @@ -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) { diff --git a/termux-shared/src/main/AndroidManifest.xml b/termux-shared/src/main/AndroidManifest.xml index 81789f3904..042e61a707 100644 --- a/termux-shared/src/main/AndroidManifest.xml +++ b/termux-shared/src/main/AndroidManifest.xml @@ -1,5 +1,4 @@ - +