Revert "Upgrade targetSDK, minSDK and support libraries"
This reverts commit 70fa1803a62eb00de2ae441a02cdfad5b847969c.
Enable launching the camera app on Android 9 by (temporarily) reverting
the commit for upgrading the targetSdkVersion.
Issue: FP2P-322
Change-Id: Ic381dabbfab7a72603af9e3f7593d5d70d1deac4
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 802283e..8d89c81 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.fairphone.programmablebutton">
+ package="com.fairphone.programmablebutton"
+ android:versionCode="10001"
+ android:versionName="1.0.1" >
+
+ <uses-sdk
+ android:minSdkVersion="21"
+ android:targetSdkVersion="23" />
<uses-permission android:name="android.permission.CAMERA" />
diff --git a/build.gradle b/build.gradle
index 6e822e6..4baa8e5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,17 +2,16 @@
buildscript {
repositories {
- google()
jcenter()
+ maven { url 'http://repo1.maven.org/maven2' }
}
dependencies {
- classpath 'com.android.tools.build:gradle:3.6.1'
+ classpath 'com.android.tools.build:gradle:1.0.0'
}
}
allprojects {
repositories {
- google()
jcenter()
}
}
@@ -22,12 +21,13 @@
apply plugin: 'com.android.application'
android {
- compileSdkVersion 28
+ compileSdkVersion 23
+ buildToolsVersion "21.1.2"
defaultConfig {
applicationId "com.fairphone.programmablebutton"
- minSdkVersion 28
- targetSdkVersion 28
+ minSdkVersion 17
+ targetSdkVersion 23
}
buildTypes {
@@ -50,6 +50,7 @@
}
// Move the tests to tests/java, tests/res, etc...
+ instrumentTest.setRoot('tests')
androidTest.setRoot('tests')
// Move the build types to build-types/<type>
@@ -64,5 +65,5 @@
}
dependencies {
- implementation 'androidx.appcompat:appcompat:1.1.0'
+ compile 'com.android.support:support-v4:23.4.0'
}
diff --git a/gradle.properties b/gradle.properties
deleted file mode 100644
index 5465fec..0000000
--- a/gradle.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-android.enableJetifier=true
-android.useAndroidX=true
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b842417..0c71e76 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.6.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip
diff --git a/gradlew b/gradlew
old mode 100755
new mode 100644
diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar
new file mode 100644
index 0000000..1437d24
--- /dev/null
+++ b/libs/android-support-v4.jar
Binary files differ