From cdefcb0d109d4558d5b9531bde2178a8b9bad0dc Mon Sep 17 00:00:00 2001 From: cyBerta Date: Fri, 9 Jul 2021 04:56:56 +0200 Subject: use bitmaskcore libs in android project --- app/build.gradle | 12 +++---- bitmask-core/bitmask-core-sources.jar | Bin 6880 -> 0 bytes bitmask-core/bitmask-core.aar | Bin 9015381 -> 0 bytes bitmask-core/build.gradle | 2 -- bitmask-web-core/bitmask-web-core-sources.jar | Bin 8696 -> 0 bytes bitmask-web-core/bitmask-web-core.aar | Bin 10633994 -> 0 bytes bitmask-web-core/build.gradle | 37 --------------------- .../bitmaskcore_arm64-sources.jar | Bin 0 -> 8156 bytes lib-bitmask-core-arm64/bitmaskcore_arm64.aar | Bin 0 -> 6083935 bytes lib-bitmask-core-arm64/build.gradle | 2 ++ lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar | Bin 0 -> 8156 bytes lib-bitmask-core-armv7/bitmaskcore_arm.aar | Bin 0 -> 6236825 bytes lib-bitmask-core-armv7/build.gradle | 2 ++ lib-bitmask-core-web/bitmaskcore_web-sources.jar | Bin 0 -> 10013 bytes lib-bitmask-core-web/bitmaskcore_web.aar | Bin 0 -> 26629129 bytes lib-bitmask-core-web/build.gradle | 2 ++ lib-bitmask-core-x86/bitmaskcore_x86-sources.jar | Bin 0 -> 8156 bytes lib-bitmask-core-x86/bitmaskcore_x86.aar | Bin 0 -> 6639027 bytes lib-bitmask-core-x86/build.gradle | 2 ++ .../bitmaskcore_x86_64-sources.jar | Bin 0 -> 8156 bytes lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar | Bin 0 -> 6823506 bytes lib-bitmask-core-x86_64/build.gradle | 2 ++ lib-bitmask-core/bitmaskcore-sources.jar | Bin 0 -> 8156 bytes lib-bitmask-core/bitmaskcore.aar | Bin 0 -> 25748179 bytes lib-bitmask-core/build.gradle | 37 +++++++++++++++++++++ scripts/build_deps.sh | 16 +++++++-- settings.gradle | 2 +- 27 files changed, 68 insertions(+), 48 deletions(-) delete mode 100644 bitmask-core/bitmask-core-sources.jar delete mode 100644 bitmask-core/bitmask-core.aar delete mode 100644 bitmask-core/build.gradle delete mode 100644 bitmask-web-core/bitmask-web-core-sources.jar delete mode 100644 bitmask-web-core/bitmask-web-core.aar delete mode 100644 bitmask-web-core/build.gradle create mode 100644 lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar create mode 100644 lib-bitmask-core-arm64/bitmaskcore_arm64.aar create mode 100644 lib-bitmask-core-arm64/build.gradle create mode 100644 lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar create mode 100644 lib-bitmask-core-armv7/bitmaskcore_arm.aar create mode 100644 lib-bitmask-core-armv7/build.gradle create mode 100644 lib-bitmask-core-web/bitmaskcore_web-sources.jar create mode 100644 lib-bitmask-core-web/bitmaskcore_web.aar create mode 100644 lib-bitmask-core-web/build.gradle create mode 100644 lib-bitmask-core-x86/bitmaskcore_x86-sources.jar create mode 100644 lib-bitmask-core-x86/bitmaskcore_x86.aar create mode 100644 lib-bitmask-core-x86/build.gradle create mode 100644 lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar create mode 100644 lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar create mode 100644 lib-bitmask-core-x86_64/build.gradle create mode 100644 lib-bitmask-core/bitmaskcore-sources.jar create mode 100644 lib-bitmask-core/bitmaskcore.aar create mode 100644 lib-bitmask-core/build.gradle diff --git a/app/build.gradle b/app/build.gradle index 7f4f667e..87c28be2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -394,12 +394,12 @@ dependencies { implementation 'info.guardianproject:tor-android:0.4.5.7' implementation 'info.guardianproject:jtorctl:0.4.5.7' - fatwebImplementation project(path: ':bitmask-web-core') - fatImplementation project(path: ':bitmask-core') - x86Implementation project(path: ':bitmask-core') - x86_64Implementation project(path: ':bitmask-core') - armv7Implementation project(path: ':bitmask-core') - arm64Implementation project(path: ':bitmask-core') + fatwebImplementation project(path: ':lib-bitmask-core-web') + fatImplementation project(path: ':lib-bitmask-core') + x86Implementation project(path: ':lib-bitmask-core-x86') + x86_64Implementation project(path: ':lib-bitmask-core-x86_64') + armv7Implementation project(path: ':lib-bitmask-core-armv7') + arm64Implementation project(path: ':lib-bitmask-core-arm64') } android.applicationVariants.all { variant -> diff --git a/bitmask-core/bitmask-core-sources.jar b/bitmask-core/bitmask-core-sources.jar deleted file mode 100644 index adf7f860..00000000 Binary files a/bitmask-core/bitmask-core-sources.jar and /dev/null differ diff --git a/bitmask-core/bitmask-core.aar b/bitmask-core/bitmask-core.aar deleted file mode 100644 index bceec02d..00000000 Binary files a/bitmask-core/bitmask-core.aar and /dev/null differ diff --git a/bitmask-core/build.gradle b/bitmask-core/build.gradle deleted file mode 100644 index 51d38614..00000000 --- a/bitmask-core/build.gradle +++ /dev/null @@ -1,2 +0,0 @@ -configurations.maybeCreate("default") -artifacts.add("default", file('bitmask-core.aar')) \ No newline at end of file diff --git a/bitmask-web-core/bitmask-web-core-sources.jar b/bitmask-web-core/bitmask-web-core-sources.jar deleted file mode 100644 index 64edeb9b..00000000 Binary files a/bitmask-web-core/bitmask-web-core-sources.jar and /dev/null differ diff --git a/bitmask-web-core/bitmask-web-core.aar b/bitmask-web-core/bitmask-web-core.aar deleted file mode 100644 index 0e5108c0..00000000 Binary files a/bitmask-web-core/bitmask-web-core.aar and /dev/null differ diff --git a/bitmask-web-core/build.gradle b/bitmask-web-core/build.gradle deleted file mode 100644 index 650f38d6..00000000 --- a/bitmask-web-core/build.gradle +++ /dev/null @@ -1,37 +0,0 @@ -/*apply plugin: 'com.android.library' - -android { - compileSdkVersion 28 - buildToolsVersion "29.0.1" - - - defaultConfig { - minSdkVersion 16 - targetSdkVersion 28 - versionCode 1 - versionName "1.0" - - testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" - consumerProguardFiles 'consumer-rules.pro' - } - - buildTypes { - release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' - } - } - -} - -dependencies { - implementation fileTree(dir: 'libs', include: ['*.jar']) - - implementation 'androidx.appcompat:appcompat:1.2.0' - testImplementation 'junit:junit:4.12' - androidTestImplementation 'androidx.test.ext:junit:1.1.0' - androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' -} -*/ -configurations.maybeCreate("default") -artifacts.add("default", file('bitmask-web-core.aar')) \ No newline at end of file diff --git a/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar b/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar new file mode 100644 index 00000000..903904ed Binary files /dev/null and b/lib-bitmask-core-arm64/bitmaskcore_arm64-sources.jar differ diff --git a/lib-bitmask-core-arm64/bitmaskcore_arm64.aar b/lib-bitmask-core-arm64/bitmaskcore_arm64.aar new file mode 100644 index 00000000..bf1b3fda Binary files /dev/null and b/lib-bitmask-core-arm64/bitmaskcore_arm64.aar differ diff --git a/lib-bitmask-core-arm64/build.gradle b/lib-bitmask-core-arm64/build.gradle new file mode 100644 index 00000000..91598024 --- /dev/null +++ b/lib-bitmask-core-arm64/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('bitmaskcore_arm64.aar')) \ No newline at end of file diff --git a/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar b/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar new file mode 100644 index 00000000..903904ed Binary files /dev/null and b/lib-bitmask-core-armv7/bitmaskcore_arm-sources.jar differ diff --git a/lib-bitmask-core-armv7/bitmaskcore_arm.aar b/lib-bitmask-core-armv7/bitmaskcore_arm.aar new file mode 100644 index 00000000..f56b2b2c Binary files /dev/null and b/lib-bitmask-core-armv7/bitmaskcore_arm.aar differ diff --git a/lib-bitmask-core-armv7/build.gradle b/lib-bitmask-core-armv7/build.gradle new file mode 100644 index 00000000..b48f6c42 --- /dev/null +++ b/lib-bitmask-core-armv7/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('bitmaskcore_arm.aar')) \ No newline at end of file diff --git a/lib-bitmask-core-web/bitmaskcore_web-sources.jar b/lib-bitmask-core-web/bitmaskcore_web-sources.jar new file mode 100644 index 00000000..7507016b Binary files /dev/null and b/lib-bitmask-core-web/bitmaskcore_web-sources.jar differ diff --git a/lib-bitmask-core-web/bitmaskcore_web.aar b/lib-bitmask-core-web/bitmaskcore_web.aar new file mode 100644 index 00000000..154101b3 Binary files /dev/null and b/lib-bitmask-core-web/bitmaskcore_web.aar differ diff --git a/lib-bitmask-core-web/build.gradle b/lib-bitmask-core-web/build.gradle new file mode 100644 index 00000000..da284c75 --- /dev/null +++ b/lib-bitmask-core-web/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('bitmaskcore_web.aar')) \ No newline at end of file diff --git a/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar b/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar new file mode 100644 index 00000000..903904ed Binary files /dev/null and b/lib-bitmask-core-x86/bitmaskcore_x86-sources.jar differ diff --git a/lib-bitmask-core-x86/bitmaskcore_x86.aar b/lib-bitmask-core-x86/bitmaskcore_x86.aar new file mode 100644 index 00000000..64867109 Binary files /dev/null and b/lib-bitmask-core-x86/bitmaskcore_x86.aar differ diff --git a/lib-bitmask-core-x86/build.gradle b/lib-bitmask-core-x86/build.gradle new file mode 100644 index 00000000..87add92f --- /dev/null +++ b/lib-bitmask-core-x86/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('bitmaskcore_x86.aar')) \ No newline at end of file diff --git a/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar b/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar new file mode 100644 index 00000000..903904ed Binary files /dev/null and b/lib-bitmask-core-x86_64/bitmaskcore_x86_64-sources.jar differ diff --git a/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar b/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar new file mode 100644 index 00000000..6579fa2f Binary files /dev/null and b/lib-bitmask-core-x86_64/bitmaskcore_x86_64.aar differ diff --git a/lib-bitmask-core-x86_64/build.gradle b/lib-bitmask-core-x86_64/build.gradle new file mode 100644 index 00000000..bc8181b3 --- /dev/null +++ b/lib-bitmask-core-x86_64/build.gradle @@ -0,0 +1,2 @@ +configurations.maybeCreate("default") +artifacts.add("default", file('bitmaskcore_x86_64.aar')) \ No newline at end of file diff --git a/lib-bitmask-core/bitmaskcore-sources.jar b/lib-bitmask-core/bitmaskcore-sources.jar new file mode 100644 index 00000000..903904ed Binary files /dev/null and b/lib-bitmask-core/bitmaskcore-sources.jar differ diff --git a/lib-bitmask-core/bitmaskcore.aar b/lib-bitmask-core/bitmaskcore.aar new file mode 100644 index 00000000..19da0b2a Binary files /dev/null and b/lib-bitmask-core/bitmaskcore.aar differ diff --git a/lib-bitmask-core/build.gradle b/lib-bitmask-core/build.gradle new file mode 100644 index 00000000..0b2ba086 --- /dev/null +++ b/lib-bitmask-core/build.gradle @@ -0,0 +1,37 @@ +/*apply plugin: 'com.android.library' + +android { + compileSdkVersion 28 + buildToolsVersion "29.0.1" + + + defaultConfig { + minSdkVersion 16 + targetSdkVersion 28 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles 'consumer-rules.pro' + } + + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + } + } + +} + +dependencies { + implementation fileTree(dir: 'libs', include: ['*.jar']) + + implementation 'androidx.appcompat:appcompat:1.2.0' + testImplementation 'junit:junit:4.12' + androidTestImplementation 'androidx.test.ext:junit:1.1.0' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' +} +*/ +configurations.maybeCreate("default") +artifacts.add("default", file('bitmaskcore.aar')) \ No newline at end of file diff --git a/scripts/build_deps.sh b/scripts/build_deps.sh index 75fd52ea..1d8d26d5 100755 --- a/scripts/build_deps.sh +++ b/scripts/build_deps.sh @@ -37,6 +37,18 @@ else then mkdir lib fi - ./build_core.sh - cd .. + ./build_core.sh || quit "failed to build bitmaskcore" + cp lib/bitmaskcore.aar ../lib-bitmask-core/. + cp lib/bitmaskcore-sources.jar ../lib-bitmask-core/. + cp lib/bitmaskcore_web.aar ../lib-bitmask-core-web/. + cp lib/bitmaskcore_web-sources.jar ../lib-bitmask-core-web/. + cp lib/bitmaskcore_arm.aar ../lib-bitmask-core-armv7/. + cp lib/bitmaskcore_arm-sources.jar ../lib-bitmask-core-armv7/. + cp lib/bitmaskcore_arm64.aar ../lib-bitmask-core-arm64/. + cp lib/bitmaskcore_arm64-sources.jar ../lib-bitmask-core-arm64/. + cp lib/bitmaskcore_x86.aar ../lib-bitmask-core-x86/. + cp lib/bitmaskcore_x86-sources.jar ../lib-bitmask-core-x86/. + cp lib/bitmaskcore_x86_64.aar ../lib-bitmask-core-x86_64/. + cp lib/bitmaskcore_x86_64-sources.jar ../lib-bitmask-core-x86_64/. + fi diff --git a/settings.gradle b/settings.gradle index 203bf293..661a41c2 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1 +1 @@ -include ':app', ':bitmask-core', ':bitmask-web-core', ':bitmaskcore', ':tor-android' \ No newline at end of file +include ':app', ':lib-bitmask-core', ':lib-bitmask-core-web', ':lib-bitmask-core-arm64', ':lib-bitmask-core-armv7', ':lib-bitmask-core-x86', ':lib-bitmask-core-x86_64', ':bitmaskcore', ':tor-android' \ No newline at end of file -- cgit v1.2.3