Skip to content

Commit fac3b19

Browse files
committed
temp rebuild of 2.5
1 parent dd57d9f commit fac3b19

33 files changed

+285
-177
lines changed

library/.gitignore

Lines changed: 0 additions & 1 deletion
This file was deleted.

library/build.gradle

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,40 +2,38 @@ apply plugin: 'com.android.library'
22
apply plugin: 'com.github.dcendents.android-maven'
33

44
android {
5-
compileSdkVersion 30
6-
buildToolsVersion "29.0.3"
7-
8-
// Needed for jitpack builds
5+
compileSdkVersion 24
6+
buildToolsVersion '26.0.2'
7+
98
packagingOptions {
109
doNotStrip '*/mips/*.so'
1110
doNotStrip '*/mips64/*.so'
1211
}
1312

1413
defaultConfig {
15-
minSdkVersion 19
16-
targetSdkVersion 30
14+
minSdkVersion 16
15+
targetSdkVersion 24
1716
versionCode 1
1817
versionName "1.0"
19-
ndk
20-
{
21-
moduleName "Scanner"
22-
}
18+
ndk {
19+
moduleName "Scanner"
20+
}
21+
sourceSets.main {
22+
jni.srcDirs = []
23+
jniLibs.srcDirs 'src/main/libs'
24+
}
2325
}
24-
sourceSets.main
25-
{
26-
jni.srcDirs = []
27-
jniLibs.srcDirs 'src/main/libs'
28-
}
26+
2927
buildTypes {
3028
release {
3129
minifyEnabled false
3230
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3331
}
3432
}
35-
33+
3634
}
3735

3836
dependencies {
3937
implementation fileTree(dir: 'libs', include: ['*.jar'])
40-
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
38+
implementation 'com.android.support:support-v4:24.2.1'
4139
}

library/proguard-rules.pro

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,10 @@
11
# Add project specific ProGuard rules here.
2-
# By default, the flags in this file are appended to flags specified
3-
# in /Users/jhansi/softwares/adt-bundle-mac-x86_64-20130729/sdk/tools/proguard/proguard-android.txt
4-
# You can edit the include path and order by changing the proguardFiles
5-
# directive in build.gradle.
2+
# You can control the set of applied configuration files using the
3+
# proguardFiles setting in build.gradle.
64
#
75
# For more details, see
86
# http://developer.android.com/guide/developing/tools/proguard.html
97

10-
# Add any project specific keep options here:
11-
128
# If your project uses WebView with JS, uncomment the following
139
# and specify the fully qualified class name to the JavaScript interface
1410
# class:

library/src/androidTest/java/com/scanlibrary/ApplicationTest.java

Lines changed: 0 additions & 13 deletions
This file was deleted.

library/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</activity>
2222

2323
<provider
24-
android:name="androidx.core.content.FileProvider"
24+
android:name="com.scanlibrary.CustomFileProvider"
2525
android:authorities="${applicationId}.com.scanlibrary.provider"
2626
android:exported="false"
2727
android:grantUriPermissions="true">

library/src/main/java/com/scanlibrary/CustomFileProvider.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.scanlibrary;
22

3-
import androidx.core.content.FileProvider;
3+
import android.support.v4.content.FileProvider;
44

55
/**
66
* Created by sekar on 21/2/18.

library/src/main/java/com/scanlibrary/IScanner.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ public interface IScanner {
1010
void onBitmapSelect(Uri uri);
1111

1212
void onScanFinish(Uri uri);
13-
}
13+
}

0 commit comments

Comments
 (0)