Skip to content

Commit

Permalink
upgrade to sdk 28, use minSdk=14, remove duplicate tests
Browse files Browse the repository at this point in the history
  • Loading branch information
friedger committed Feb 13, 2019
1 parent 557eafe commit 570ad9e
Show file tree
Hide file tree
Showing 33 changed files with 114 additions and 1,277 deletions.
8 changes: 1 addition & 7 deletions FileManager/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="org.openintents.filemanager"
android:installLocation="auto"
android:versionCode="38"
android:versionName="2.2.1">
android:installLocation="auto">

<!--
History:
Expand Down Expand Up @@ -52,10 +50,6 @@
[1] 1.0.0: 2008-12-10
-->

<uses-sdk
android:minSdkVersion="4"
android:targetSdkVersion="19"/>

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>
Expand Down
28 changes: 14 additions & 14 deletions FileManager/build.gradle
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
apply plugin: 'com.android.application'

dependencies {
compile 'com.github.openintents:distribution:1.1.3'
compile 'com.android.support:appcompat-v7:25.3.1'
implementation 'com.github.openintents:distribution:1.1.3'
implementation 'com.android.support:appcompat-v7:28.0.0'

androidTestCompile 'com.android.support.test:runner:0.5'
androidTestCompile 'com.android.support.test:rules:0.5'
androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.2'
androidTestCompile 'com.android.support.test.espresso:espresso-intents:2.2.2'
androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.2'
androidTestCompile 'com.android.support:support-annotations:25.3.1'
compile 'com.android.support.test.espresso:espresso-idling-resource:2.2.2'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-intents:3.0.2'
androidTestImplementation 'com.android.support.test.uiautomator:uiautomator-v18:2.1.3'
androidTestImplementation 'com.android.support:support-annotations:28.0.0'
implementation 'com.android.support.test.espresso:espresso-idling-resource:3.0.2'
}

android {
compileSdkVersion 25
buildToolsVersion '26.0.2'
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "org.openintents.filemanager"
versionCode 40
versionName "2.2.3"
minSdkVersion 9
targetSdkVersion 25
minSdkVersion 14
targetSdkVersion 28

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
Expand Down Expand Up @@ -66,7 +66,7 @@ android {
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith('.apk')) {
def fileName = outputFile.name.replace('.apk', "-${versionName}.apk")
output.outputFileName = new File(outputFile.parent, fileName)
output.outputFileName = new File(output.outputFile.parent, fileName).getName()
}
}
}
Expand Down
62 changes: 0 additions & 62 deletions FileManager/res/menu-v11/context.xml

This file was deleted.

37 changes: 0 additions & 37 deletions FileManager/res/menu-v11/simple_file_list.xml

This file was deleted.

9 changes: 5 additions & 4 deletions FileManager/res/menu/context.xml
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/menu_open"
android:title="@string/menu_open">
</item>
<item
android:id="@+id/menu_delete"
android:icon="@drawable/ic_action_delete"
Expand All @@ -18,6 +14,11 @@
android:icon="@drawable/ic_action_copy"
android:title="@string/menu_copy">
</item>
<item
android:id="@+id/menu_select_all"
android:alphabeticShortcut="a"
android:icon="@drawable/select_all"
android:title="@string/menu_check_all"/>
<item
android:id="@+id/menu_send"
android:icon="@drawable/ic_action_send"
Expand Down
2 changes: 1 addition & 1 deletion FileManager/res/menu/simple_file_list.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
xmlns:app="http://schemas.android.com/apk/res-auto">

<item
android:id="@+id/menu_multiselect"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,6 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.menu_media_scan_exclude:
excludeFromMediaScan();
return true;

case R.id.menu_paste:
if (((FileManagerApplication) getActivity().getApplication()).getCopyHelper().canPaste())
((FileManagerApplication) getActivity().getApplication()).getCopyHelper().paste(new File(getPath()), new CopyHelper.OnOperationFinishedListener() {
Expand Down
1 change: 0 additions & 1 deletion FileManagerDemo/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
1.0.1 [2]: 2011-02-05
1.0.0 [1]: 2008-12-11 -->

<uses-sdk android:minSdkVersion="2" android:targetSdkVersion="19"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

<application android:icon="@drawable/icon" android:label="@string/app_name">
Expand Down
84 changes: 84 additions & 0 deletions FileManagerDemo/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
apply plugin: 'com.android.application'

dependencies {
implementation 'com.github.openintents:distribution:1.1.3'
}

android {
compileSdkVersion 28
buildToolsVersion '28.0.3'

defaultConfig {
applicationId "org.openintents.filemanager.demo"
versionCode 40
versionName "2.2.3"
minSdkVersion 14
targetSdkVersion 28

testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
jni.srcDirs = ['jni']
}


// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... which would
// conflict with src/ being used by the main source set.
// Adding new build types or product flavors should be accompanied
// by a similar customization.
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}

lintOptions {
abortOnError false
}

buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt'

applicationVariants.all { variant ->
variant.outputs.each { output ->
def outputFile = output.outputFile
if (outputFile != null && outputFile.name.endsWith('.apk')) {
def fileName = outputFile.name.replace('.apk', "-${versionName}.apk")
output.outputFileName = new File(output.outputFile.parent, fileName).getName()
}
}
}
}
}

def propertyFile = new File(projectDir, "build-private.properties")
if (propertyFile && propertyFile.exists()) {
signingConfigs {
release {
Properties props = new Properties()
props.load(new FileInputStream(propertyFile))

storeFile file(props.getProperty("key.store"))
storePassword props.getProperty("key.store.password")
keyAlias props.getProperty("key.alias")
keyPassword props.getProperty("key.alias.password")
}
}
buildTypes.release.signingConfig signingConfigs.release
println "Release apks will be signed!"
} else {
println "For signed release apks you need to create a build-private.properties file"
}

}
42 changes: 0 additions & 42 deletions FileManagerDemo/build.properties

This file was deleted.

Loading

0 comments on commit 570ad9e

Please sign in to comment.