temp rebuild of 2.5

NeutrinosPlatform · Oct 14, 2021 · fac3b19 · fac3b19
1 parent dd57d9f
commit fac3b19
Show file tree

Hide file tree

Showing 33 changed files with 285 additions and 177 deletions.
diff --git a/library/.gitignore b/library/.gitignore
diff --git a/library/build.gradle b/library/build.gradle
@@ -2,40 +2,38 @@ apply plugin: 'com.android.library'
 apply plugin: 'com.github.dcendents.android-maven'
 
 android {
-    compileSdkVersion 30
-    buildToolsVersion "29.0.3"
-
-    // Needed for jitpack builds
+    compileSdkVersion 24
+    buildToolsVersion '26.0.2'
+
     packagingOptions {
         doNotStrip '*/mips/*.so'
         doNotStrip '*/mips64/*.so'
     }
 
     defaultConfig {
-        minSdkVersion 19
-        targetSdkVersion 30
+        minSdkVersion 16
+        targetSdkVersion 24
         versionCode 1
         versionName "1.0"
-        ndk
-                {
-                    moduleName "Scanner"
-                }
+        ndk {
+            moduleName "Scanner"
+        }
+        sourceSets.main {
+            jni.srcDirs = []
+            jniLibs.srcDirs 'src/main/libs'
+        }
     }
-    sourceSets.main
-            {
-                jni.srcDirs = []
-                jniLibs.srcDirs 'src/main/libs'
-            }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-    
+
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.android.support:support-v4:24.2.1'
 }
diff --git a/library/proguard-rules.pro b/library/proguard-rules.pro
@@ -1,14 +1,10 @@
 # Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /Users/jhansi/softwares/adt-bundle-mac-x86_64-20130729/sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
+# 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
 
-# Add any project specific keep options here:
-
 # If your project uses WebView with JS, uncomment the following
 # and specify the fully qualified class name to the JavaScript interface
 # class:

diff --git a/library/src/androidTest/java/com/scanlibrary/ApplicationTest.java b/library/src/androidTest/java/com/scanlibrary/ApplicationTest.java
diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -21,7 +21,7 @@
         </activity>
 
         <provider
-            android:name="androidx.core.content.FileProvider"
+            android:name="com.scanlibrary.CustomFileProvider"
             android:authorities="${applicationId}.com.scanlibrary.provider"
             android:exported="false"
             android:grantUriPermissions="true">

diff --git a/library/src/main/java/com/scanlibrary/CustomFileProvider.java b/library/src/main/java/com/scanlibrary/CustomFileProvider.java
@@ -1,6 +1,6 @@
 package com.scanlibrary;
 
-import androidx.core.content.FileProvider;
+import android.support.v4.content.FileProvider;
 
 /**
  * Created by sekar on 21/2/18.

diff --git a/library/src/main/java/com/scanlibrary/IScanner.java b/library/src/main/java/com/scanlibrary/IScanner.java
@@ -10,4 +10,4 @@ public interface IScanner {
     void onBitmapSelect(Uri uri);
 
     void onScanFinish(Uri uri);
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,4 +10,4 @@ public interface IScanner { @@
         void onBitmapSelect(Uri uri);
         void onScanFinish(Uri uri);
-    }
+    }