diff --git a/.gitignore b/.gitignore index cf5c8d4aff..0f07527a6d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,23 @@ READY/ .settings *.so *~ +.idea/ +third-party/drag-sort-listview/drag-sort-listview.iml +third-party/android-filechooser/android-filechooser.iml +third-party/SuperToasts/SuperToasts.iml +fbreader/zip-amse/zip-amse.iml +fbreader/util/util.iml +fbreader/text-formats/text-formats.iml +fbreader/resources/resources.iml +fbreader/common/common.iml +fbreader/app/app.iml +fbreader/api/api.iml +FBReader-Android-Forked.iml +*.keystore +third-party/AmbilWarna/AmbilWarna.iml +fbreader/text-formats/ +fbreader/app/arm64v8a/ +fbreader/app/armv7a/ +fbreader/app/fat/ +fbreader/app/x86/ +fbreader/app/x8664/ \ No newline at end of file diff --git a/FBReader-Android-2.iml b/FBReader-Android-2.iml new file mode 100644 index 0000000000..cb7ff8dc73 --- /dev/null +++ b/FBReader-Android-2.iml @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index e69de29bb2..c483a8f76d 100644 --- a/build.gradle +++ b/build.gradle @@ -0,0 +1,31 @@ +buildscript { + repositories { + jcenter() + google() + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:3.1.2' + } +} + +allprojects { + repositories { + jcenter() + google() + } + //added to remove compilation warnings: + gradle.projectsEvaluated { + tasks.withType(JavaCompile) { + options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" + } + } + project.ext { + globalBuildToolsVersion="27.0.3" //"28.0.0-rc1" // '28.0.0 rc1' + globalMinSdkVersion=16 + globalMaxSdkVersion=27 + globalTargetSdkVersion=18 //27 //'P' //27 //MAX 18 for SDCARD READ/WRITE Permissions without adding more code + globalCompileSdkVersion=27 //'android-P' //27 + } +} diff --git a/fbreader/api/build.gradle b/fbreader/api/build.gradle index 8bb0c4a75f..878a159946 100644 --- a/fbreader/api/build.gradle +++ b/fbreader/api/build.gradle @@ -1,32 +1,17 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} - apply plugin: 'com.android.library' dependencies { - compile project(':fbreader/util') + api project(':util') } android { - compileSdkVersion 10 - buildToolsVersion '20' + compileSdkVersion project.ext.globalCompileSdkVersion + buildToolsVersion project.ext.globalBuildToolsVersion lintOptions { abortOnError false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - sourceSets { main.java.srcDirs = ['src/main/java'] main.aidl.srcDirs = ['src/main/java'] @@ -35,9 +20,9 @@ android { } defaultConfig { - minSdkVersion 5 - maxSdkVersion 10 - targetSdkVersion 9 + minSdkVersion project.ext.globalMinSdkVersion + maxSdkVersion project.ext.globalMaxSdkVersion + targetSdkVersion project.ext.globalTargetSdkVersion versionCode 1 versionName "1.0" } diff --git a/fbreader/app/build.gradle b/fbreader/app/build.gradle index 6a7ff9391b..0fe980bb2f 100644 --- a/fbreader/app/build.gradle +++ b/fbreader/app/build.gradle @@ -1,45 +1,54 @@ buildscript { repositories { + jcenter() mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' + google() } } apply plugin: 'com.android.application' dependencies { - compile project(':fbreader/api') - compile project(':fbreader/util') - compile project(':fbreader/common') - compile project(':fbreader/resources') - compile project(':fbreader/text-formats') - compile project(':fbreader/zip-amse') - compile project(':third-party/drag-sort-listview') - compile project(':third-party/android-filechooser') - compile project(':third-party/SuperToasts') - compile project(':third-party/AmbilWarna') - compile files('libs/nanohttpd-2.0.5.jar') - compile files('libs/httpmime-4.2.5.jar') - compile files('libs/pdfparse.jar') + implementation project(':api') + api project(':util') + api project(':common') + api project(':resources') + api project(':text-formats') + api project(':drag-sort-listview') + api project(':android-filechooser') + api project(':SuperToasts') + api project(':AmbilWarna') + api project(':zip-amse') + + implementation 'com.android.support:support-v4:27.1.1' + implementation ('com.googlecode.json-simple:json-simple:1.1.1') { + exclude group: 'junit', module: 'junit' + } + + implementation files('libs/nanohttpd-2.0.5.jar') + implementation files('libs/httpmime-4.2.5.jar') + implementation files('libs/pdfparse.jar') } android { - compileSdkVersion 19 - buildToolsVersion '20' + compileSdkVersion project.ext.globalCompileSdkVersion + buildToolsVersion project.ext.globalBuildToolsVersion + useLibrary 'org.apache.http.legacy' lintOptions { abortOnError false } defaultConfig { - minSdkVersion 5 - maxSdkVersion 10 - targetSdkVersion 9 + minSdkVersion project.ext.globalMinSdkVersion + maxSdkVersion project.ext.globalMaxSdkVersion + targetSdkVersion project.ext.globalTargetSdkVersion versionCode 0 versionName new File("$projectDir/VERSION").text.trim() + multiDexEnabled true + + buildConfigField "String", "FBNETWORK_KEY", "${FBREADER_ORG_FBNETWORK_KEY}" + buildConfigField "String", "FBNETWORK_SECRET", "${FBREADER_ORG_FBNETWORK_SECRET}" } sourceSets { @@ -52,30 +61,24 @@ android { } signingConfigs { + debug { + } release { - storeFile file(RELEASE_STORE_FILE) - storePassword RELEASE_STORE_PASSWORD - keyAlias RELEASE_KEY_ALIAS - keyPassword RELEASE_KEY_PASSWORD } } - buildTypes { + debug { + minifyEnabled false + debuggable true + versionNameSuffix '-DEBUG' + } + release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard.cfg' - signingConfig signingConfigs.release - - buildConfigField "String", "FBNETWORK_KEY", "${FBREADER_ORG_FBNETWORK_KEY}" - buildConfigField "String", "FBNETWORK_SECRET", "${FBREADER_ORG_FBNETWORK_SECRET}" +// signingConfig signingConfigs.release } } - - applicationVariants.all { variant -> - def generateHelpTask = project.tasks.create "generateHelp${variant.name.capitalize()}", Exec - generateHelpTask.commandLine('src/main/help/generate.py', 'src/main/help/proto', 'src/main/help/html', variant.outputs[0].processResources.assetsDir.path + '/data/intro') - variant.mergeResources.dependsOn(generateHelpTask) - } } android { @@ -85,43 +88,62 @@ android { fat { dimension 'abi' ndk { - abiFilters 'x86', 'armeabi-v7a', 'armeabi', 'mips' + abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64' + // , 'armeabi', 'mips' //obsolete versionCode 0 } } - arm { - dimension 'abi' - ndk { - abiFilter 'armeabi' - versionCode 1 - } - } - armv7a { - dimension 'abi' - ndk { - abiFilter 'armeabi-v7a' - versionCode 2 - } - } - x86 { - dimension 'abi' - ndk { - abiFilter 'x86' - versionCode 3 - } - } - mips { - dimension 'abi' - ndk { - abiFilter 'mips' - versionCode 4 - } - } + // // arm { //obsolete + // // dimension 'abi' + // // ndk { + // // abiFilter 'armeabi' + // // versionCode 1 + // // } + // // } + // armv7a { + // dimension 'abi' + // ndk { + // abiFilter 'armeabi-v7a' + // versionCode 1 + // } + // } + // arm64v8a { + // dimension 'abi' + // ndk { + // abiFilter 'arm64-v8a' + // versionCode 2 + // } + // } + // x86 { + // dimension 'abi' + // ndk { + // abiFilter 'x86' + // versionCode 3 + // } + // } + // x8664 { + // dimension 'abi' + // ndk { + // abiFilter 'x86_64' + // versionCode 4 + // } + // } + // // mips { //obsolete + // // dimension 'abi' + // // ndk { + // // abiFilter 'mips' + // // versionCode 4 + // // } + // // } } task ndkBuild(type: Exec) { - def ndkDir = plugins.getPlugin('com.android.application').sdkHandler.getNdkFolder() - commandLine "$ndkDir/ndk-build", '-C', file('src/main/jni').absolutePath + def ndkDir = project.android.ndkDirectory.absolutePath + if (org.gradle.internal.os.OperatingSystem.current().isWindows()) { + commandLine "$ndkDir\\ndk-build.cmd", '-C', file('src/main/jni').absolutePath + } else { + commandLine "$ndkDir/ndk-build", '-C', file('src/main/jni').absolutePath + } } tasks.withType(JavaCompile) { @@ -154,6 +176,7 @@ android.applicationVariants.all { variant -> } else { throw new IllegalArgumentException('Unsupported version format: ' + version) } - - variant.mergedFlavor.versionCode = baseCode + 10 + abiVersion + variant.outputs.all { output -> + output.setVersionCodeOverride(baseCode + 10 + abiVersion) + } } diff --git a/fbreader/app/src/main/AndroidManifest.xml b/fbreader/app/src/main/AndroidManifest.xml index 472f369aac..89a66c49a7 100644 --- a/fbreader/app/src/main/AndroidManifest.xml +++ b/fbreader/app/src/main/AndroidManifest.xml @@ -6,15 +6,16 @@ > + - - + + - + { private final ZLResource myResource = ZLResource.resource("editBookmark"); diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java index c43439c0e2..cabc3d1294 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/image/ImageViewActivity.java @@ -258,7 +258,7 @@ private boolean onDoubleTouchEvent(MotionEvent event) { myStartPinchDistance2 = distance2; myStartZoomFactor = myZoomFactor; } else { - myZoomFactor = myStartZoomFactor * FloatMath.sqrt(distance2 / myStartPinchDistance2); + myZoomFactor = myStartZoomFactor * (float) Math.sqrt(distance2 / myStartPinchDistance2); postInvalidate(); } } diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java index fa1fec2755..4219e2bb48 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/AddCustomCatalogActivity.java @@ -26,8 +26,10 @@ import android.view.View; import android.view.inputmethod.InputMethodManager; import android.widget.Button; +import android.widget.EditText; import android.widget.TextView; +import group.pals.android.lib.ui.filechooser.utils.Ui; import org.geometerplus.zlibrary.core.resources.ZLResource; import org.geometerplus.zlibrary.core.network.ZLNetworkException; import org.geometerplus.zlibrary.core.util.MimeType; @@ -77,11 +79,14 @@ protected void onCreate(Bundle icicle) { setupButton( R.id.ok_button, "ok", new View.OnClickListener() { public void onClick(View view) { - final InputMethodManager imm = - (InputMethodManager)getSystemService(INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(findViewById(R.id.add_custom_catalog_url).getWindowToken(), 0); - imm.hideSoftInputFromWindow(findViewById(R.id.add_custom_catalog_title).getWindowToken(), 0); - imm.hideSoftInputFromWindow(findViewById(R.id.add_custom_catalog_summary).getWindowToken(), 0); + EditText url = findViewById(R.id.add_custom_catalog_url); + Ui.hideSoftKeyboard(AddCustomCatalogActivity.this, url.getWindowToken()); + + EditText title = findViewById(R.id.add_custom_catalog_title); + Ui.hideSoftKeyboard(AddCustomCatalogActivity.this, title.getWindowToken()); + + EditText summary = findViewById(R.id.add_custom_catalog_summary); + Ui.hideSoftKeyboard(AddCustomCatalogActivity.this, summary.getWindowToken()); onOkButton(); } } diff --git a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java index 8911017cc2..3366b1dc9c 100644 --- a/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java +++ b/fbreader/app/src/main/java/org/geometerplus/android/fbreader/network/BookDownloaderService.java @@ -226,7 +226,7 @@ private Notification createDownloadFinishNotification(File file, String title, b notification.flags |= Notification.FLAG_AUTO_CANCEL; final Intent intent = success ? getFBReaderIntent(file) : new Intent(); final PendingIntent contentIntent = PendingIntent.getActivity(this, 0, intent, 0); - notification.setLatestEventInfo(getApplicationContext(), title, contentText, contentIntent); + //notification.setLatestEventInfo(getApplicationContext(), title, contentText, contentIntent); return notification; } diff --git a/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/CursorManager.java b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/CursorManager.java index ca1925045f..1d8da16846 100644 --- a/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/CursorManager.java +++ b/fbreader/app/src/main/java/org/geometerplus/zlibrary/text/view/CursorManager.java @@ -19,8 +19,7 @@ package org.geometerplus.zlibrary.text.view; -import android.support.v4.util.LruCache; - +import android.util.LruCache; import org.geometerplus.zlibrary.text.model.ZLTextModel; final class CursorManager extends LruCache { diff --git a/fbreader/app/src/main/jni/Application.mk b/fbreader/app/src/main/jni/Application.mk index 10d63b7b02..296dbaa457 100644 --- a/fbreader/app/src/main/jni/Application.mk +++ b/fbreader/app/src/main/jni/Application.mk @@ -1,2 +1,2 @@ -APP_ABI := armeabi armeabi-v7a x86 mips +APP_ABI := armeabi-v7a arm64-v8a x86 x86_64 APP_STL := stlport_static diff --git a/fbreader/app/src/main/res/layout/books_directory_fix.xml b/fbreader/app/src/main/res/layout/books_directory_fix.xml index 7e8a7b596f..1e7d136597 100644 --- a/fbreader/app/src/main/res/layout/books_directory_fix.xml +++ b/fbreader/app/src/main/res/layout/books_directory_fix.xml @@ -16,11 +16,13 @@ android:layout_height="wrap_content" android:layout_marginBottom="10dp" /> + + + - &- +cd "`dirname \"$PRG\"`/" >/dev/null APP_HOME="`pwd -P`" -cd "$SAVED" >&- +cd "$SAVED" >/dev/null CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar @@ -114,6 +109,7 @@ fi if $cygwin ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000000..8a0b282aa6 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/project.properties b/project.properties index afe0918068..d1ec89eaf9 100644 --- a/project.properties +++ b/project.properties @@ -13,7 +13,7 @@ source.dir=${main.dir}/java java.encoding=utf-8 # proguard.config=proguard.cfg # Project target. -target=android-19 +target=android-27 android.library.reference.1=third-party/AmbilWarna android.library.reference.2=third-party/drag-sort-listview/library android.library.reference.3=third-party/android-filechooser/code diff --git a/settings.gradle b/settings.gradle index 540da20e5e..5ff127a413 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,11 +1,13 @@ -include 'fbreader/app' -include 'fbreader/api' -include 'fbreader/util' -include 'fbreader/common' -include 'fbreader/resources' -include 'fbreader/text-formats' -include 'fbreader/zip-amse' -include 'third-party/drag-sort-listview' -include 'third-party/android-filechooser' -include 'third-party/SuperToasts' -include 'third-party/AmbilWarna' +include ':app', ':api', ':util', ':common', ':resources', ':text-formats', ':zip-amse',':drag-sort-listview', ':SuperToasts', ':AmbilWarna', ':android-filechooser' + +project(':app').projectDir = new File('fbreader/app') +project(':api').projectDir = new File('fbreader/api') +project(':util').projectDir = new File('fbreader/util') +project(':common').projectDir = new File('fbreader/common') +project(':resources').projectDir = new File('fbreader/resources') +project(':text-formats').projectDir = new File('fbreader/text-formats') +project(':zip-amse').projectDir = new File('fbreader/zip-amse') +project(':drag-sort-listview').projectDir = new File('third-party/drag-sort-listview') +project(':android-filechooser').projectDir = new File('third-party/android-filechooser') +project(':SuperToasts').projectDir = new File('third-party/SuperToasts') +project(':AmbilWarna').projectDir = new File('third-party/AmbilWarna') \ No newline at end of file diff --git a/third-party/AmbilWarna/AmbilWarna.iml b/third-party/AmbilWarna/AmbilWarna.iml deleted file mode 100644 index a74440d60f..0000000000 --- a/third-party/AmbilWarna/AmbilWarna.iml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/third-party/AmbilWarna/build.gradle b/third-party/AmbilWarna/build.gradle index 71ec66769b..99776e5c51 100644 --- a/third-party/AmbilWarna/build.gradle +++ b/third-party/AmbilWarna/build.gradle @@ -1,28 +1,13 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} - apply plugin: 'com.android.library' android { - compileSdkVersion 17 - buildToolsVersion '20' + compileSdkVersion project.ext.globalCompileSdkVersion + buildToolsVersion project.ext.globalBuildToolsVersion lintOptions { abortOnError false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - sourceSets { main.java.srcDirs = ['src'] main.res.srcDirs = ['res'] @@ -30,9 +15,9 @@ android { } defaultConfig { - minSdkVersion 5 - maxSdkVersion 10 - targetSdkVersion 9 + minSdkVersion project.ext.globalMinSdkVersion + //maxSdkVersion project.ext.globalMaxSdkVersion + targetSdkVersion project.ext.globalTargetSdkVersion versionCode 1 versionName "1.0" } diff --git a/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java b/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java index 2d315c8ee1..f1e333dbfb 100644 --- a/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java +++ b/third-party/AmbilWarna/src/yuku/ambilwarna/widget/AmbilWarnaPrefWidgetView.java @@ -19,8 +19,8 @@ public AmbilWarnaPrefWidgetView(Context context, AttributeSet attrs) { super(context, attrs); float density = context.getResources().getDisplayMetrics().density; - rectSize = FloatMath.floor(24.f * density + 0.5f); - strokeWidth = FloatMath.floor(1.f * density + 0.5f); + rectSize = (float) Math.floor(24.f * density + 0.5f); + strokeWidth = (float) Math.floor(1.f * density + 0.5f); paint = new Paint(); paint.setColor(0xffffffff); diff --git a/third-party/SuperToasts/build.gradle b/third-party/SuperToasts/build.gradle index 4e919e1de7..99776e5c51 100644 --- a/third-party/SuperToasts/build.gradle +++ b/third-party/SuperToasts/build.gradle @@ -1,28 +1,13 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} - apply plugin: 'com.android.library' android { - compileSdkVersion 19 - buildToolsVersion '20' + compileSdkVersion project.ext.globalCompileSdkVersion + buildToolsVersion project.ext.globalBuildToolsVersion lintOptions { abortOnError false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - sourceSets { main.java.srcDirs = ['src'] main.res.srcDirs = ['res'] @@ -30,9 +15,9 @@ android { } defaultConfig { - minSdkVersion 5 - maxSdkVersion 10 - targetSdkVersion 9 + minSdkVersion project.ext.globalMinSdkVersion + //maxSdkVersion project.ext.globalMaxSdkVersion + targetSdkVersion project.ext.globalTargetSdkVersion versionCode 1 versionName "1.0" } diff --git a/third-party/android-filechooser/build.gradle b/third-party/android-filechooser/build.gradle index 7f1860efb5..a1508933e6 100644 --- a/third-party/android-filechooser/build.gradle +++ b/third-party/android-filechooser/build.gradle @@ -1,32 +1,17 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} - apply plugin: 'com.android.library' dependencies { - compile project(':fbreader/util') + api project(':util') } android { - compileSdkVersion 14 - buildToolsVersion '20' + compileSdkVersion project.ext.globalCompileSdkVersion + buildToolsVersion project.ext.globalBuildToolsVersion lintOptions { abortOnError false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - sourceSets { main.java.srcDirs = ['code/src'] main.res.srcDirs = ['code/res'] @@ -34,9 +19,9 @@ android { } defaultConfig { - minSdkVersion 5 - maxSdkVersion 10 - targetSdkVersion 9 + minSdkVersion project.ext.globalMinSdkVersion + //maxSdkVersion project.ext.globalMaxSdkVersion + targetSdkVersion project.ext.globalTargetSdkVersion versionCode 1 versionName "1.0" } diff --git a/third-party/drag-sort-listview/build.gradle b/third-party/drag-sort-listview/build.gradle index 97c1803a46..1e0f94b9ed 100644 --- a/third-party/drag-sort-listview/build.gradle +++ b/third-party/drag-sort-listview/build.gradle @@ -1,32 +1,17 @@ -buildscript { - repositories { - mavenCentral() - } - - dependencies { - classpath 'com.android.tools.build:gradle:1.3.0' - } -} - apply plugin: 'com.android.library' dependencies { - compile 'com.android.support:support-v4:21.0.0' + implementation 'com.android.support:support-v4:27.1.1' } android { - compileSdkVersion 10 - buildToolsVersion '20' + compileSdkVersion project.ext.globalCompileSdkVersion + buildToolsVersion project.ext.globalBuildToolsVersion lintOptions { abortOnError false } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - sourceSets { main.java.srcDirs = ['library/src'] main.res.srcDirs = ['library/res'] @@ -34,10 +19,8 @@ android { } defaultConfig { - minSdkVersion 5 - maxSdkVersion 10 - targetSdkVersion 9 - versionCode 1 - versionName "1.0" + minSdkVersion project.ext.globalMinSdkVersion + //maxSdkVersion project.ext.globalMaxSdkVersion + targetSdkVersion project.ext.globalTargetSdkVersion } }