Bump gradle from 7.1.3 to 7.2.0 (#403)

* Bump gradle from 7.1.3 to 7.2.0 Bumps gradle from 7.1.3 to 7.2.0. --- updated-dependencies: - dependency-name: com.android.tools.build:gradle dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * Update Gradle version Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Tom Roush <4317255+TomRoush@users.noreply.github.com>
TomRoush · May 10, 2022 · ad6b957 · ad6b957
1 parent c5fc9c6
commit ad6b957
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 16 deletions.
diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
         jcenter() // jp2-android
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.1.3'
+        classpath 'com.android.tools.build:gradle:7.2.0'
     }
 }
 

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 #Sun Feb 06 22:46:08 CST 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
@@ -13,12 +13,10 @@ android {
     compileOptions.encoding = 'UTF-8'
 
     defaultConfig {
+        testInstrumentationRunnerArguments notAnnotation: 'androidx.test.filters.FlakyTest'
         minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION)
         targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION)
-        versionName project.VERSION_NAME
-        versionCode Integer.parseInt(project.VERSION_CODE)
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        testInstrumentationRunnerArgument "notAnnotation", "androidx.test.filters.FlakyTest"
     }
 
     buildTypes {
@@ -27,9 +25,6 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     testOptions {
         unitTests.returnDefaultValues = true
@@ -43,6 +38,10 @@ android {
             assets.srcDirs = ['src/test/resources']
         }
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.tom_roush.pdfbox'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/library/src/androidTest/AndroidManifest.xml b/library/src/androidTest/AndroidManifest.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tom_roush.pdfbox">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.INTERNET" />
 </manifest>
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -1,3 +1,3 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest package="com.tom_roush.pdfbox">
+<manifest>
 </manifest>
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -17,14 +17,15 @@ android {
         }
     }
 
-    lintOptions {
-        abortOnError false
-    }
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
+    lint {
+        abortOnError false
+    }
+    namespace 'com.tom_roush.pdfbox.sample'
 }
 
 dependencies {

diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.tom_roush.pdfbox.sample" >
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"