From bc3433b4298443382ed29da7949b7e83eedf6f5d Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Mon, 19 Nov 2018 15:51:50 +0000 Subject: [PATCH 1/5] Android / Gradle updates (current working build): upgraded API 26 to 28, build tools to 28.0.3, Gradle 4.10.2, see https://github.com/readium/readium-sdk/pull/317 and https://github.com/readium/readium-lcp-client/pull/49 --- SDKLauncher-Android/app/build_experimental.gradle | 6 +++--- SDKLauncher-Android/app/build_stable.gradle | 6 +++--- SDKLauncher-Android/app/src/main/AndroidManifest.xml | 2 +- .../gradle/wrapper/gradle-wrapper.properties | 4 ++-- SDKLauncher-Android/project.properties | 2 +- readium-lcp-client | 2 +- readium-sdk | 2 +- readium-shared-js | 2 +- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/SDKLauncher-Android/app/build_experimental.gradle b/SDKLauncher-Android/app/build_experimental.gradle index a3edd4fb..51943398 100644 --- a/SDKLauncher-Android/app/build_experimental.gradle +++ b/SDKLauncher-Android/app/build_experimental.gradle @@ -35,8 +35,8 @@ model { } android { - compileSdkVersion = 26 - buildToolsVersion = "27.0.3" + compileSdkVersion = 28 + buildToolsVersion = "28.0.3" defaultConfig { @@ -47,7 +47,7 @@ model { minSdkVersion.apiLevel = 19 // manifest/uses-sdk@android:targetSdkVersion attribute in src/main/AndroidManifest.xml - targetSdkVersion.apiLevel = 26 + targetSdkVersion.apiLevel = 28 // manifest@android:versionCode attribute in src/main/AndroidManifest.xml versionCode 31 diff --git a/SDKLauncher-Android/app/build_stable.gradle b/SDKLauncher-Android/app/build_stable.gradle index c1a8819f..e4badd7c 100644 --- a/SDKLauncher-Android/app/build_stable.gradle +++ b/SDKLauncher-Android/app/build_stable.gradle @@ -11,8 +11,8 @@ def lcpDir = project(':lcp').projectDir def epub3Dir = project(':epub3').projectDir android { - compileSdkVersion = 26 - buildToolsVersion = "27.0.3" + compileSdkVersion = 28 + buildToolsVersion = "28.0.3" lintOptions { checkReleaseBuilds = false @@ -40,7 +40,7 @@ android { minSdkVersion 19 // manifest/uses-sdk@android:targetSdkVersion attribute in src/main/AndroidManifest.xml - targetSdkVersion 26 + targetSdkVersion 28 // manifest@android:versionCode attribute in src/main/AndroidManifest.xml versionCode 31 diff --git a/SDKLauncher-Android/app/src/main/AndroidManifest.xml b/SDKLauncher-Android/app/src/main/AndroidManifest.xml index fb236505..82b8809b 100644 --- a/SDKLauncher-Android/app/src/main/AndroidManifest.xml +++ b/SDKLauncher-Android/app/src/main/AndroidManifest.xml @@ -6,7 +6,7 @@ + android:targetSdkVersion="28" /> diff --git a/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties b/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties index 9b328d61..47d56e6e 100644 --- a/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties +++ b/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties @@ -5,5 +5,5 @@ zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists #https://services.gradle.org/distributions # GRADLE EXPERIMENTAL requires 3.3 -# GRADLE STABLE works with latest (4.4) -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip \ No newline at end of file +# GRADLE STABLE works with latest (4.10.2) +distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip \ No newline at end of file diff --git a/SDKLauncher-Android/project.properties b/SDKLauncher-Android/project.properties index 667da871..1f72937a 100644 --- a/SDKLauncher-Android/project.properties +++ b/SDKLauncher-Android/project.properties @@ -11,5 +11,5 @@ #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt # Project target. -target=android-26 +target=android-28 android.library.reference.1=../readium-sdk/Platform/Android diff --git a/readium-lcp-client b/readium-lcp-client index 9a33f286..157dcd9c 160000 --- a/readium-lcp-client +++ b/readium-lcp-client @@ -1 +1 @@ -Subproject commit 9a33f286244368e8fa2dd6d0a1b0656a84217a2a +Subproject commit 157dcd9ccac01d8b8d311a97092f5c240f496a30 diff --git a/readium-sdk b/readium-sdk index 47a2710a..1fc5f1a3 160000 --- a/readium-sdk +++ b/readium-sdk @@ -1 +1 @@ -Subproject commit 47a2710ae7ed6c59806f2a01b7fe62b1622ed503 +Subproject commit 1fc5f1a3e32979fe5fbd73864a5a1ee5844fb3d7 diff --git a/readium-shared-js b/readium-shared-js index 2f3444fb..28620de3 160000 --- a/readium-shared-js +++ b/readium-shared-js @@ -1 +1 @@ -Subproject commit 2f3444fb92df67dd2ac4bf9ec2f1cae2bf399a70 +Subproject commit 28620de318d0da4afed547002fd5ad2ed004a5c1 From acca72d9cf7d21eaa83d69246958aa2e3cd60c05 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Sun, 16 Jun 2019 02:25:56 +0100 Subject: [PATCH 2/5] latest changes to Gradle config aligned with ReadiumSDK and ReadiumLCP libs (64 bits support, etc.) --- SDKLauncher-Android/app/build.gradle | 33 +++-- .../app/build_experimental.gradle | 108 ++++++++++++-- SDKLauncher-Android/app/build_stable.gradle | 134 +++++++++++++++--- SDKLauncher-Android/build.gradle | 88 ++++++++---- .../gradle/wrapper/gradle-wrapper.properties | 8 +- SDKLauncher-Android/settings.gradle | 5 + clean.sh | 20 ++- readium-lcp-client | 2 +- readium-sdk | 2 +- 9 files changed, 311 insertions(+), 89 deletions(-) diff --git a/SDKLauncher-Android/app/build.gradle b/SDKLauncher-Android/app/build.gradle index 076e2b23..3ef81dec 100644 --- a/SDKLauncher-Android/app/build.gradle +++ b/SDKLauncher-Android/app/build.gradle @@ -1,21 +1,26 @@ def ndk_experimental = (rootProject.hasProperty("readium_ndk_experimental") && rootProject.readium_ndk_experimental) +println "[[${project.name}]] (APP) Gradle Experimental: ${ndk_experimental}" + if (ndk_experimental) { - println "${project.name}: Using Gradle EXPERIMENTAL to build application" apply from: 'build_experimental.gradle' } else { - println "${project.name}: Using Gradle STABLE to build application" apply from: 'build_stable.gradle' } - repositories { + if (!ndk_experimental) { + google() + } + maven { + url "https://maven.google.com" + } mavenCentral() jcenter() + maven { url 'https://maven.fabric.io/public' } flatDir { dirs '../libs' } - maven { url 'https://maven.fabric.io/public' } } dependencies { @@ -56,18 +61,22 @@ buildAssets.dependsOn "buildCssAssets", apply from: 'build_epubReadingSystem.gradle' tasks.whenTaskAdded { task -> - def taskName = task.name + println "[[${project.name}]] (APP) TaskAdded: ${task.name}" + + if (task.name.startsWith("compile")) { + def isDebug = task.name.toLowerCase().contains("debug") - if (taskName.startsWith("compile")) { if (ndk_experimental) { task.dependsOn "buildAssets", - ":lcp:build", - "buildEpubReadingSystem" + isDebug ? ":lcp:assembleDebug" : ":lcp:assembleRelease", + "buildEpubReadingSystem" } else { - println("Task: ${taskName}") task.dependsOn "buildAssets", - ":epub3:buildMk", - "buildEpubReadingSystem" + isDebug ? ":lcp:assembleDebug" : ":lcp:assembleRelease", + "buildEpubReadingSystem" } } -} \ No newline at end of file +} +gradle.buildFinished { buildResult -> + println "[[${project.name}]] (APP) buildFinished" +} diff --git a/SDKLauncher-Android/app/build_experimental.gradle b/SDKLauncher-Android/app/build_experimental.gradle index 51943398..d2c19491 100644 --- a/SDKLauncher-Android/app/build_experimental.gradle +++ b/SDKLauncher-Android/app/build_experimental.gradle @@ -11,7 +11,11 @@ def store_password = (rootProject.hasProperty("readium_sign_store_password") ? def lcpDir = project(':lcp').projectDir def epub3Dir = project(':epub3').projectDir +def rsdkDir = project(':rsdk').projectDir +def _buildTypes = [] +def _productFlavors = [] +def currentBuildType model { android.lintOptions { checkReleaseBuilds = false @@ -101,19 +105,105 @@ model { } //buildTypes productFlavors { - if (!ndk_skipARM) - create("arm") { + if (!ndk_skipARM && !ndk_skipX86) { + create('armeabi-v7a--arm64-v8a--x86--x86_64') { ndk.with { - abiFilters.add("armeabi-v7a") + abiFilters.add('armeabi-v7a') + abiFilters.add('arm64-v8a') + abiFilters.add('x86') + abiFilters.add('x86_64') } } - - if (!ndk_skipX86) - create("x86") { - ndk.with { - abiFilters.add("x86") + } else { + if (!ndk_skipARM) { + create('armeabi-v7a--arm64-v8a') { + ndk.with { + abiFilters.add('armeabi-v7a') + abiFilters.add('arm64-v8a') + } + } + } + if (!ndk_skipX86) { + create('x86--x86_64') { + ndk.with { + abiFilters.add('x86') + abiFilters.add('x86_64') + } } } + } } //productFlavors } //android -} //model \ No newline at end of file + + components.android { + binaries.afterEach { binary -> + println "[[${project.name}]] (APP) components.android.binaries buildType: ${binary.getBuildType().name}" + if (!_buildTypes.contains(binary.getBuildType().name)) { + println "[[${project.name}]] (APP) components.android.binaries buildType ADDED" + _buildTypes += binary.getBuildType().name + } + + binary.getProductFlavors().each { flavor -> + println " [[${project.name}]] (APP) components.android.binaries productFlavor: ${flavor.name}" + if (!_productFlavors.contains(flavor)) { + println " [[${project.name}]] (APP) components.android.binaries productFlavor ADDED" + _productFlavors += flavor + } + + flavor.ndk.abiFilters.each { abiFilter -> + println " [[${project.name}]] (APP) components.android.binaries abiFilter (${abiFilter})" + } + } + // binary.mergedNdkConfig.cppFlags.add("-DVARIANT=\"" + binary.name + "\"") + } + } +} //model + +gradle.taskGraph.whenReady { taskGraph -> + println "[[${project.name}]] (APP) taskGraph ready" + + // taskGraph.getAllTasks().last().finalizedBy("copyLibs") + // taskGraph.getAllTasks().last().doLast "copyLibs" + taskGraph.getAllTasks().last().doLast { + println "[[${project.name}]] (APP) last TASK (${currentBuildType})" + } // .dependsOn "copyLibs" + + if (taskGraph.hasTask(buildRelease)) { + println "[[${project.name}]] (APP) taskGraph RELEASE (build)" + + currentBuildType = "release" + } else if (taskGraph.hasTask(buildDebug)) { + println "[[${project.name}]] (APP) taskGraph DEBUG (build)" + + currentBuildType = "debug" + } else { + if (taskGraph.hasTask(assembleRelease)) { + println "[[${project.name}]] (APP) taskGraph RELEASE (assemble)" + + currentBuildType = "release" + } + if (taskGraph.hasTask(assembleDebug)) { + println "[[${project.name}]] (APP) taskGraph DEBUG (assemble)" + + currentBuildType = "debug" + } + } +} + +task buildRelease(type: GradleBuild, dependsOn: build) { +} + +task buildDebug(type: GradleBuild, dependsOn: build) { +} + +// task assembleRelease(type: GradleBuild, dependsOn: assemble) { +// } + +// task assembleDebug(type: GradleBuild, dependsOn: assemble) { +// } + +// tasks.all { task -> +// if (task.name.startsWith('compile') && task.name.endsWith('Ndk')) { +// task.enabled = false +// } +// } diff --git a/SDKLauncher-Android/app/build_stable.gradle b/SDKLauncher-Android/app/build_stable.gradle index e4badd7c..b6af5177 100644 --- a/SDKLauncher-Android/app/build_stable.gradle +++ b/SDKLauncher-Android/app/build_stable.gradle @@ -9,8 +9,19 @@ def store_password = (rootProject.hasProperty("readium_sign_store_password") ? def lcpDir = project(':lcp').projectDir def epub3Dir = project(':epub3').projectDir +def rsdkDir = project(':rsdk').projectDir +println "[[${project.name}]] (APP) Skip ARM: ${ndk_skipARM}" +println "[[${project.name}]] (APP) Skip x86: ${ndk_skipX86}" + +def currentBuildType android { + applicationVariants.all { variant -> + println "[[${project.name}]] (APP) libraryVariant buildType: ${variant.buildType.name}" + + // currentBuildType = variant.buildType.name + } + compileSdkVersion = 28 buildToolsVersion = "28.0.3" @@ -62,24 +73,36 @@ android { jniLibs { dependencies { - project ":epub3" + // project ":rsdk" project ":lcp" } - srcDirs = [ - "${epub3Dir}/libs", - "${lcpDir}/libs" - ] + // srcDirs = [ + // "${epub3Dir}/jniLibs/RELEASE", + // "${lcpDir}/jniLibs/RELEASE", + // "${epub3Dir}/jniLibs/DEBUG", + // "${lcpDir}/jniLibs/DEBUG" + // ] } //jniLibs } //main } //sourceSets buildTypes { debug { + sourceSets.main.jniLibs.srcDirs = [ + // "${epub3Dir}/jniLibs/DEBUG", + "${lcpDir}/jniLibs/DEBUG" + ] + ext.enableCrashlytics = false minifyEnabled = false } release { + sourceSets.main.jniLibs.srcDirs = [ + // "${epub3Dir}/jniLibs/RELEASE", + "${lcpDir}/jniLibs/RELEASE" + ] + ext.enableCrashlytics = false minifyEnabled = false @@ -92,27 +115,96 @@ android { } } //buildTypes + flavorDimensions "version" productFlavors { - if (!ndk_skipARM) - "arm" { - /*dependencies { - compile('org.readium.sdk.lcp:liblcp-armeabi-v7a@aar') - }*/ - + if (!ndk_skipARM && !ndk_skipX86) { + 'armeabi-v7a--arm64-v8a--x86--x86_64' { + dimension "version" ndk.with { - abiFilters = ["armeabi-v7a"] + abiFilters = ['armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'] } } - - if (!ndk_skipX86) - "x86" { - /*dependencies { - compile('org.readium.sdk.lcp:liblcp-x86@aar') - }*/ - - ndk.with { - abiFilters = ["x86"] + } else { + if (!ndk_skipARM) { + 'armeabi-v7a--arm64-v8a' { + dimension "version" + ndk.with { + abiFilters = ['armeabi-v7a', 'arm64-v8a'] + } + } + } + if (!ndk_skipX86) { + 'x86--x86_64' { + dimension "version" + ndk.with { + abiFilters = ['x86', 'x86_64'] + } } } + } } //productFlavors } //android + +// task sourceSetJniLibsSrcDirs { +// doFirst { +// println ("sourceSetJniLibsSrcDirs: ${currentBuildType}") +// android.sourceSets.jniLibs.srcDirs = [ +// "${epub3Dir}/libs/${currentBuildType.toUpperCase()}", +// "${lcpDir}/libs/${currentBuildType.toUpperCase()}" +// ] +// } +// } + +// tasks.whenTaskAdded { task -> +// def taskName = task.name + +// if (taskName.startsWith("compile")) { +// task.dependsOn "sourceSetJniLibsSrcDirs" +// } +// } + +// dependencies { +// compile project(":lcp") +// } + +gradle.taskGraph.whenReady { taskGraph -> + println "[[${project.name}]] (APP) taskGraph ready" + + // taskGraph.getAllTasks().last().finalizedBy copyLibs + taskGraph.getAllTasks().last().doLast { + println "[[${project.name}]] (APP) last TASK (${currentBuildType})" + } // .dependsOn copyLibs + + if (taskGraph.hasTask(buildRelease)) { + println "[[${project.name}]] (APP) taskGraph RELEASE (build)" + + currentBuildType = "release" + } else if (taskGraph.hasTask(buildDebug)) { + println "[[${project.name}]] (APP) taskGraph DEBUG (build)" + + currentBuildType = "debug" + } else { + if (taskGraph.hasTask(assembleRelease)) { + println "[[${project.name}]] (APP) taskGraph RELEASE (assemble)" + + currentBuildType = "release" + } + if (taskGraph.hasTask(assembleDebug)) { + println "[[${project.name}]] (APP) taskGraph DEBUG (assemble)" + + currentBuildType = "debug" + } + } +} + +task buildRelease(type: GradleBuild, dependsOn: build) { +} + +task buildDebug(type: GradleBuild, dependsOn: build) { +} + +// task assembleRelease(type: GradleBuild, dependsOn: assemble) { +// } + +// task assembleDebug(type: GradleBuild, dependsOn: assemble) { +// } diff --git a/SDKLauncher-Android/build.gradle b/SDKLauncher-Android/build.gradle index 4786fdd0..a34bc5ef 100644 --- a/SDKLauncher-Android/build.gradle +++ b/SDKLauncher-Android/build.gradle @@ -1,51 +1,74 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. -buildscript { - repositories { - jcenter() - maven { url 'https://maven.fabric.io/public' } - } - dependencies { - - Properties properties = new Properties() - properties.load(rootProject.file('local.properties').newDataInputStream()) +Properties properties = new Properties() +properties.load(rootProject.file('local.properties').newDataInputStream()) - def ndkClang = properties.getProperty('readium.ndk_clang', "false") - ndkClang = (ndkClang == "true") ? true : false; - rootProject.ext.set('readium_ndk_clang', ndkClang) +def ndkClang = properties.getProperty('readium.ndk_clang', "false") +ndkClang = (ndkClang == "true") ? true : false; +rootProject.ext.set('readium_ndk_clang', ndkClang) // def ndk_clang = (rootProject.hasProperty("readium_ndk_clang") && rootProject.readium_ndk_clang) // if (ndk_clang) environment 'READIUM_CLANG', 'true' - def ndkSkipX86 = properties.getProperty('readium.ndk_skipX86', "false") - ndkSkipX86 = (ndkSkipX86 == "true") ? true : false; - rootProject.ext.set('readium_ndk_skipX86', ndkSkipX86) +def ndkSkipX86 = properties.getProperty('readium.ndk_skipX86', "false") +ndkSkipX86 = (ndkSkipX86 == "true") ? true : false; +rootProject.ext.set('readium_ndk_skipX86', ndkSkipX86) // def ndk_skipX86 = (rootProject.hasProperty("readium_ndk_skipX86") && rootProject.readium_ndk_skipX86) // if (ndk_skipX86) environment 'READIUM_SKIPX86', 'true' - def ndkSkipARM = properties.getProperty('readium.ndk_skipARM', "false") - ndkSkipARM = (ndkSkipARM == "true") ? true : false; - rootProject.ext.set('readium_ndk_skipARM', ndkSkipARM) +def ndkSkipARM = properties.getProperty('readium.ndk_skipARM', "false") +ndkSkipARM = (ndkSkipARM == "true") ? true : false; +rootProject.ext.set('readium_ndk_skipARM', ndkSkipARM) // def ndk_skipARM = (rootProject.hasProperty("readium_ndk_skipARM") && rootProject.readium_ndk_skipARM) // if (ndk_skipARM) environment 'READIUM_SKIPARM', 'true' - def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false") - ndkExperimental = (ndkExperimental == "true") ? true : false; - rootProject.ext.set('readium_ndk_experimental', ndkExperimental) +def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false") +ndkExperimental = (ndkExperimental == "true") ? true : false; +rootProject.ext.set('readium_ndk_experimental', ndkExperimental) // def ndk_experimental = (rootProject.hasProperty("readium_ndk_experimental") && rootProject.readium_ndk_experimental) // if (ndk_experimental) environment 'READIUM_EXPERIMENTAL', 'true' - def signKeyPassword = properties.getProperty('readium.sign_key_password', "na") - rootProject.ext.set('readium_sign_key_password', signKeyPassword) +def signKeyPassword = properties.getProperty('readium.sign_key_password', "na") +rootProject.ext.set('readium_sign_key_password', signKeyPassword) - def signStorePassword = properties.getProperty('readium.sign_store_password', "na") - rootProject.ext.set('readium_sign_store_password', signStorePassword) +def signStorePassword = properties.getProperty('readium.sign_store_password', "na") +rootProject.ext.set('readium_sign_store_password', signStorePassword) + +println "[[${project.name}]] (ROOT) Gradle Experimental: ${ndkExperimental}" +println "[[${project.name}]] (ROOT) Skip ARM: ${ndkSkipARM}" +println "[[${project.name}]] (ROOT) Skip x86: ${ndkSkipX86}" +println "[[${project.name}]] (ROOT) Clang: ${ndkClang}" + +buildscript { + repositories { + Properties properties = new Properties() + properties.load(rootProject.file('local.properties').newDataInputStream()) + def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false") + ndkExperimental = (ndkExperimental == "true") ? true : false; + + if (!ndkExperimental) { + google() + } + maven { + url "https://maven.google.com" + } + mavenCentral() + jcenter() + maven { url 'https://maven.fabric.io/public' } + } + dependencies { + Properties properties = new Properties() + properties.load(rootProject.file('local.properties').newDataInputStream()) + def ndkExperimental = properties.getProperty('readium.ndk_experimental', "false") + ndkExperimental = (ndkExperimental == "true") ? true : false; if (ndkExperimental) { - //https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view + // https://bintray.com/android/android-tools/com.android.tools.build.gradle-experimental/view + // https://mvnrepository.com/artifact/com.android.tools.build/gradle-experimental?repo=google + // 0.11.1 fails https://stackoverflow.com/questions/47057160/ classpath "com.android.tools.build:gradle-experimental:0.9.3" } - //https://bintray.com/android/android-tools/com.android.tools.build.gradle/view - classpath "com.android.tools.build:gradle:2.3.3" + // https://bintray.com/android/android-tools/com.android.tools.build.gradle/view + // https://mvnrepository.com/artifact/com.android.tools.build/gradle?repo=google + classpath "com.android.tools.build:gradle:3.4.1" classpath 'io.fabric.tools:gradle:1.+' } @@ -53,6 +76,13 @@ buildscript { allprojects { repositories { + if (!ndkExperimental) { + google() + } + maven { + url "https://maven.google.com" + } + mavenCentral() jcenter() flatDir { dirs 'libs' diff --git a/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties b/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties index 47d56e6e..9df3313e 100644 --- a/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties +++ b/SDKLauncher-Android/gradle/wrapper/gradle-wrapper.properties @@ -3,7 +3,7 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -#https://services.gradle.org/distributions -# GRADLE EXPERIMENTAL requires 3.3 -# GRADLE STABLE works with latest (4.10.2) -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip \ No newline at end of file +# https://services.gradle.org/distributions +# GRADLE EXPERIMENTAL requires 3.3 (the 4.1 + 0.11.1 combo fails, see https://stackoverflow.com/questions/47057160/ ) +# GRADLE STABLE works with latest 5.4.1 +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip \ No newline at end of file diff --git a/SDKLauncher-Android/settings.gradle b/SDKLauncher-Android/settings.gradle index 0449b8ce..e81f3f4c 100644 --- a/SDKLauncher-Android/settings.gradle +++ b/SDKLauncher-Android/settings.gradle @@ -1,6 +1,11 @@ include ':epub3' +include ':rsdk' + include ':lcp' + include ':app' project(':epub3').projectDir = new File(rootProject.projectDir, '../readium-sdk/Platform/Android/epub3') +project(':rsdk').projectDir = new File(rootProject.projectDir, '../readium-sdk/Platform/Android/lib') + project(':lcp').projectDir = new File(rootProject.projectDir, '../readium-lcp-client/platform/android/lib') diff --git a/clean.sh b/clean.sh index d241bad4..46238f78 100755 --- a/clean.sh +++ b/clean.sh @@ -1,16 +1,12 @@ #!/bin/sh -rm -r SDKLauncher-Android/app/build -rm -r SDKLauncher-Android/build +rm -rf SDKLauncher-Android/app/build +rm -rf SDKLauncher-Android/build -rm -r readium-sdk/Platform/Android/epub3/include +cd readium-sdk/Platform/Android/ +. ./clean.sh +cd - -rm -r readium-sdk/Platform/Android/build -rm -r readium-sdk/Platform/Android/epub3/build -# rm -r readium-sdk/Platform/Android/epub3/libs -rm -r readium-sdk/Platform/Android/epub3/obj - -rm -r readium-lcp-client/platform/android/build -rm -r readium-lcp-client/platform/android/lib/build -# rm -r readium-lcp-client/platform/android/lib/libs -rm -r readium-lcp-client/platform/android/lib/obj +cd readium-lcp-client/platform/android/ +. ./clean.sh +cd - diff --git a/readium-lcp-client b/readium-lcp-client index 157dcd9c..0277d71d 160000 --- a/readium-lcp-client +++ b/readium-lcp-client @@ -1 +1 @@ -Subproject commit 157dcd9ccac01d8b8d311a97092f5c240f496a30 +Subproject commit 0277d71d9c44d006a45fb463bdc45902e6ab30a2 diff --git a/readium-sdk b/readium-sdk index 1fc5f1a3..41c079db 160000 --- a/readium-sdk +++ b/readium-sdk @@ -1 +1 @@ -Subproject commit 1fc5f1a3e32979fe5fbd73864a5a1ee5844fb3d7 +Subproject commit 41c079dbcf3c41c71c4a8eaf1e8199f924ffaaa2 From a2372fb3700f6b8e8b8095bea1684b9ea7b4995d Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Sun, 16 Jun 2019 11:08:05 +0100 Subject: [PATCH 3/5] removed obsolete statement (fixes AndroidStudio error message) --- SDKLauncher-Android/app/src/main/AndroidManifest.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/SDKLauncher-Android/app/src/main/AndroidManifest.xml b/SDKLauncher-Android/app/src/main/AndroidManifest.xml index 82b8809b..891be26a 100644 --- a/SDKLauncher-Android/app/src/main/AndroidManifest.xml +++ b/SDKLauncher-Android/app/src/main/AndroidManifest.xml @@ -4,9 +4,9 @@ android:versionCode="31" android:versionName="1.31" > - + + + From 117db2df2e45692be6a29930b4d9b34413733254 Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Thu, 3 Oct 2019 20:26:05 +0100 Subject: [PATCH 4/5] DEBUG APK did not contain JNI libs (RELEASE worked) --- SDKLauncher-Android/app/build_stable.gradle | 38 +++++++++++++++------ 1 file changed, 28 insertions(+), 10 deletions(-) diff --git a/SDKLauncher-Android/app/build_stable.gradle b/SDKLauncher-Android/app/build_stable.gradle index b6af5177..460153dd 100644 --- a/SDKLauncher-Android/app/build_stable.gradle +++ b/SDKLauncher-Android/app/build_stable.gradle @@ -84,25 +84,43 @@ android { // ] } //jniLibs } //main + + debug { + jniLibs { + srcDirs = [ + // "${epub3Dir}/jniLibs/DEBUG", + "${lcpDir}/jniLibs/DEBUG" + ] + } //jniLibs + } //debug + + release { + jniLibs { + srcDirs = [ + // "${epub3Dir}/jniLibs/RELEASE", + "${lcpDir}/jniLibs/RELEASE" + ] + } //jniLibs + } //release } //sourceSets buildTypes { debug { - sourceSets.main.jniLibs.srcDirs = [ - // "${epub3Dir}/jniLibs/DEBUG", - "${lcpDir}/jniLibs/DEBUG" - ] - +// sourceSets.main.jniLibs.srcDirs = [ +// // "${epub3Dir}/jniLibs/DEBUG", +// "${lcpDir}/jniLibs/DEBUG" +// ] + ext.enableCrashlytics = false minifyEnabled = false } release { - sourceSets.main.jniLibs.srcDirs = [ - // "${epub3Dir}/jniLibs/RELEASE", - "${lcpDir}/jniLibs/RELEASE" - ] - +// sourceSets.main.jniLibs.srcDirs = [ +// // "${epub3Dir}/jniLibs/RELEASE", +// "${lcpDir}/jniLibs/RELEASE" +// ] + ext.enableCrashlytics = false minifyEnabled = false From 9bfb45a3430ac2240366650e087f8342f1d6d4fe Mon Sep 17 00:00:00 2001 From: Daniel Weck Date: Wed, 29 Jan 2020 10:27:22 +0000 Subject: [PATCH 5/5] fix for newer Chromium webview: android:usesCleartextTraffic="true" --- SDKLauncher-Android/app/src/main/AndroidManifest.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/SDKLauncher-Android/app/src/main/AndroidManifest.xml b/SDKLauncher-Android/app/src/main/AndroidManifest.xml index 891be26a..57635ff5 100644 --- a/SDKLauncher-Android/app/src/main/AndroidManifest.xml +++ b/SDKLauncher-Android/app/src/main/AndroidManifest.xml @@ -20,7 +20,8 @@ android:allowBackup="true" android:icon="@drawable/ic_launcher" android:label="@string/app_name" - android:theme="@style/AppTheme" > + android:theme="@style/AppTheme" + android:usesCleartextTraffic="true" >