Update gradle and configuration files

Vasyl Koshkin · Vasyl Koshkin · commit 41ff327e1e7f · 2024-03-10T22:38:45.000+02:00
diff --git a/android-pdf-viewer/bintray.gradle b/android-pdf-viewer/bintray.gradle
diff --git a/android-pdf-viewer/build.gradle b/android-pdf-viewer/build.gradle
@@ -1,44 +1,58 @@
-apply plugin: 'com.android.library'
-
-ext {
-    bintrayRepo = 'maven'
-    bintrayName = 'android-pdf-viewer'
-
-    publishedGroupId = 'com.github.barteksc'
-    libraryName = 'AndroidPdfViewer'
-    artifact = 'android-pdf-viewer'
-
-    libraryDescription = 'Android view for displaying PDFs rendered with PdfiumAndroid'
-
-    siteUrl = 'https://github.com/barteksc/AndroidPdfViewer'
-    gitUrl = 'https://github.com/barteksc/AndroidPdfViewer.git'
-
-    libraryVersion = '3.2.0-beta.1'
-
-    developerId = 'barteksc'
-    developerName = 'Bartosz Schiller'
-    developerEmail = 'barteksch@boo.pl'
-
-    licenseName = 'The Apache Software License, Version 2.0'
-    licenseUrl = 'http://www.apache.org/licenses/LICENSE-2.0.txt'
-    allLicenses = ["Apache-2.0"]
+plugins {
+    id 'com.android.library'
+    id 'maven-publish'
 }
 
 android {
-    compileSdkVersion 28
+    namespace "com.github.barteksc.pdfviewer"
+
+    compileSdk rootProject.tools.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdk rootProject.tools.minSdk
+        targetSdk rootProject.tools.targetSdk
+
         versionCode 1
-        versionName "3.2.0-beta.1"
+        versionName "${rootProject.tools.versionName}"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_17
+        targetCompatibility JavaVersion.VERSION_17
+    }
+
+    publishing {
+        publishing {
+            singleVariant("release") {
+                withSourcesJar()
+                withJavadocJar()
+            }
+        }
+    }
 }
 
 dependencies {
-    implementation 'com.android.support:support-compat:28.0.0'
-    api 'com.github.barteksc:pdfium-android:1.9.0'
+    implementation 'androidx.appcompat:appcompat:1.6.1'
+    api 'com.github.lion1988dev:PdfiumAndroid:1.9.1'
 }
 
-apply from: 'bintray.gradle'
+publishing {
+    publications {
+        release(MavenPublication) {
+            groupId = 'com.github.lion1988dev'
+            artifactId = 'com.github.barteksc.pdfviewer'
+            version = "3.2.1"
+
+            afterEvaluate {
+                from components.release
+            }
+        }
+    }
+}
diff --git a/android-pdf-viewer/consumer-rules.pro b/android-pdf-viewer/consumer-rules.pro
diff --git a/android-pdf-viewer/proguard-rules.pro b/android-pdf-viewer/proguard-rules.pro
@@ -0,0 +1,22 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
+-keep class com.shockwave.**
diff --git a/android-pdf-viewer/src/main/AndroidManifest.xml b/android-pdf-viewer/src/main/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.github.barteksc.pdfviewer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
               
 </manifest>
diff --git a/build.gradle b/build.gradle
@@ -1,19 +1,13 @@
-
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-    dependencies {
-        classpath 'com.android.tools.build:gradle:3.4.2'
-        classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4'
-        classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
-    }
+plugins {
+    id 'com.android.application' version '8.3.0' apply false
+    id 'com.android.library' version '8.3.0' apply false
 }
 
-allprojects {
-    repositories {
-        google()
-        jcenter()
-    }
+ext {
+    tools = [
+            minSdk      : 23,
+            targetSdk   : 34,
+            compileSdk  : 34,
+            versionName: '3.2.1'
+    ]
 }
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Sun Aug 18 01:14:14 CEST 2019
+#Sun Mar 10 12:47:57 EET 2024
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.1.1-all.zip
diff --git a/sample/build.gradle b/sample/build.gradle
@@ -1,32 +1,33 @@
-buildscript {
-    repositories {
-        google()
-        jcenter()
-    }
-}
-
-repositories {
-    google()
-    jcenter()
+plugins {
+    id 'com.android.application'
 }
 
-apply plugin: 'com.android.application'
-
 android {
-    compileSdkVersion 28
+    namespace "com.github.barteksc.sample"
+
+    compileSdk rootProject.tools.compileSdk
 
     defaultConfig {
-        minSdkVersion 14
-        targetSdkVersion 28
+        minSdk rootProject.tools.minSdk
+        targetSdk rootProject.tools.targetSdk
+
         versionCode 3
-        versionName "3.0.0"
-    }
+        versionName "${rootProject.tools.versionName}"
 
+        javaCompileOptions {
+            annotationProcessorOptions {
+                arguments = ["androidManifestFile": "$projectDir/src/main/AndroidManifest.xml".toString()]
+            }
+        }
+    }
 }
 
 dependencies {
+    implementation 'androidx.appcompat:appcompat:1.6.1'
     implementation project(':android-pdf-viewer')
-    implementation 'com.android.support:appcompat-v7:28.0.0'
+//    implementation 'com.github.lion1988dev:AndroidPdfViewer:3.2.1'
+
     implementation 'org.androidannotations:androidannotations-api:4.6.0'
+
     annotationProcessor "org.androidannotations:androidannotations:4.6.0"
 }
diff --git a/sample/src/main/AndroidManifest.xml b/sample/src/main/AndroidManifest.xml
@@ -7,14 +7,18 @@
 		android:icon="@drawable/ic_launcher"
 		android:label="@string/app_name"
 		android:theme="@style/Theme.AppCompat.Light">
+
 		<activity
 			android:name="PDFViewActivity_"
-			android:label="@string/app_name" >
+			android:exported="true">
+
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 				<category android:name="android.intent.category.LAUNCHER" />
 			</intent-filter>
+
 		</activity>
+
 	</application>
 
 </manifest>
diff --git a/settings.gradle b/settings.gradle
@@ -1,2 +1,19 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        google()
+        mavenCentral()
+    }
+}
+dependencyResolutionManagement {
+    repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
+    repositories {
+        google()
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
+    }
+}
+rootProject.name = "AndroidPdfViewer demo"
+
 include ':android-pdf-viewer'
-include ':sample'
+include ':sample'
