Page MenuHomePhabricator
Files F3406487

D7961.id27033.diff
No OneTemporary
Actions

D7961.id27033.diff
View Options

diff --git a/.dockerignore b/.dockerignore
--- a/.dockerignore
+++ b/.dockerignore
@@ -18,7 +18,6 @@
!native/ios/Podfile
!native/cpp/CommonCpp/grpc
!native/expo-modules/android-lifecycle/package.json
-!native/expo-modules/aes-crypto/package.json
!native/expo-modules/comm-expo-package/package.json
!native/expo-modules/thumbhash/package.json
diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile
--- a/keyserver/Dockerfile
+++ b/keyserver/Dockerfile
@@ -124,8 +124,6 @@
keyserver/addons/rust-node-addon/
COPY --chown=comm native/expo-modules/android-lifecycle/package.json \
native/expo-modules/android-lifecycle/
-COPY --chown=comm native/expo-modules/aes-crypto/package.json \
- native/expo-modules/aes-crypto/
COPY --chown=comm native/expo-modules/comm-expo-package/package.json \
native/expo-modules/comm-expo-package/
COPY --chown=comm native/expo-modules/thumbhash/package.json \
diff --git a/native/expo-modules/aes-crypto/android/build.gradle b/native/expo-modules/aes-crypto/android/build.gradle
deleted file mode 100644
--- a/native/expo-modules/aes-crypto/android/build.gradle
+++ /dev/null
@@ -1,91 +0,0 @@
-apply plugin: 'com.android.library'
-apply plugin: 'kotlin-android'
-apply plugin: 'maven-publish'
-
-group = 'app.comm.android.aescrypto'
-version = '0.1.0'
-
-buildscript {
- def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle")
- if (expoModulesCorePlugin.exists()) {
- apply from: expoModulesCorePlugin
- applyKotlinExpoModulesCorePlugin()
- }
-
- // Simple helper that allows the root project to override versions declared by this library.
- ext.safeExtGet = { prop, fallback ->
- rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
- }
-
- // Ensures backward compatibility
- ext.getKotlinVersion = {
- if (ext.has("kotlinVersion")) {
- ext.kotlinVersion()
- } else {
- ext.safeExtGet("kotlinVersion", "1.6.10")
- }
- }
-
- repositories {
- mavenCentral()
- }
-
- dependencies {
- classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:${getKotlinVersion()}")
- }
-}
-
-// Creating sources with comments
-task androidSourcesJar(type: Jar) {
- classifier = 'sources'
- from android.sourceSets.main.java.srcDirs
-}
-
-afterEvaluate {
- publishing {
- publications {
- release(MavenPublication) {
- from components.release
- // Add additional sourcesJar to artifacts
- artifact(androidSourcesJar)
- }
- }
- repositories {
- maven {
- url = mavenLocal().url
- }
- }
- }
-}
-
-android {
- compileSdkVersion safeExtGet("compileSdkVersion", 33)
-
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_11
- targetCompatibility JavaVersion.VERSION_11
- }
-
- kotlinOptions {
- jvmTarget = JavaVersion.VERSION_11.majorVersion
- }
-
- defaultConfig {
- minSdkVersion safeExtGet("minSdkVersion", 21)
- targetSdkVersion safeExtGet("targetSdkVersion", 33)
- versionCode 1
- versionName "0.1.0"
- }
- lintOptions {
- abortOnError false
- }
-}
-
-repositories {
- mavenCentral()
-}
-
-dependencies {
- implementation project(':expo-modules-core')
- implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${getKotlinVersion()}"
-}
diff --git a/native/expo-modules/aes-crypto/android/src/main/AndroidManifest.xml b/native/expo-modules/aes-crypto/android/src/main/AndroidManifest.xml
deleted file mode 100644
--- a/native/expo-modules/aes-crypto/android/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<manifest package="app.comm.android.aescrypto">
-</manifest>
diff --git a/native/expo-modules/aes-crypto/expo-module.config.json b/native/expo-modules/aes-crypto/expo-module.config.json
deleted file mode 100644
--- a/native/expo-modules/aes-crypto/expo-module.config.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
- "platforms": ["ios", "android"],
- "ios": {
- "modules": ["AESCryptoModule"]
- },
- "android": {
- "modules": ["app.comm.android.aescrypto.AESCryptoModule"]
- }
-}
diff --git a/native/expo-modules/aes-crypto/ios/AESCrypto.podspec b/native/expo-modules/aes-crypto/ios/AESCrypto.podspec
deleted file mode 100644
--- a/native/expo-modules/aes-crypto/ios/AESCrypto.podspec
+++ /dev/null
@@ -1,27 +0,0 @@
-require 'json'
-
-package = JSON.parse(File.read(File.join(__dir__, '..', 'package.json')))
-
-Pod::Spec.new do |s|
- s.name = 'AESCrypto'
- s.version = package['version']
- s.summary = package['description']
- s.description = package['description']
- s.license = package['license']
- s.author = 'Comm'
- s.homepage = 'https://comm.app'
- s.platform = :ios, '13.0'
- s.swift_version = '5.4'
- s.source = { git: 'https://github.com/CommE2E/comm' }
- s.static_framework = true
-
- s.dependency 'ExpoModulesCore'
-
- # Swift/Objective-C compatibility
- s.pod_target_xcconfig = {
- 'DEFINES_MODULE' => 'YES',
- 'SWIFT_COMPILATION_MODE' => 'wholemodule'
- }
-
- s.source_files = "**/*.{h,m,swift}"
-end
diff --git a/native/expo-modules/aes-crypto/package.json b/native/expo-modules/aes-crypto/package.json
deleted file mode 100644
--- a/native/expo-modules/aes-crypto/package.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "name": "@commapp/aes-crypto",
- "version": "0.0.1",
- "private": true,
- "license": "BSD-3-Clause",
- "description": "AES GCM encryption and decryption",
- "dependencies": {},
- "devDependencies": {
- "expo-module-scripts": "^3.0.3",
- "expo-modules-core": "1.1.1"
- },
- "peerDependencies": {
- "expo": "*",
- "react": "*",
- "react-native": "*"
- }
-}
diff --git a/native/expo-modules/aes-crypto/android/src/main/java/app/comm/android/aescrypto/AESCryptoModule.kt b/native/expo-modules/comm-expo-package/android/src/main/java/app/comm/android/aescrypto/AESCryptoModule.kt
rename from native/expo-modules/aes-crypto/android/src/main/java/app/comm/android/aescrypto/AESCryptoModule.kt
rename to native/expo-modules/comm-expo-package/android/src/main/java/app/comm/android/aescrypto/AESCryptoModule.kt
diff --git a/native/expo-modules/comm-expo-package/expo-module.config.json b/native/expo-modules/comm-expo-package/expo-module.config.json
--- a/native/expo-modules/comm-expo-package/expo-module.config.json
+++ b/native/expo-modules/comm-expo-package/expo-module.config.json
@@ -1,9 +1,12 @@
{
"platforms": ["ios", "android"],
"ios": {
- "modules": ["HelloWorldModule"]
+ "modules": ["AESCryptoModule", "HelloWorldModule"]
},
"android": {
- "modules": ["app.comm.android.expo.HelloWorldModule"]
+ "modules": [
+ "app.comm.android.aescrypto.AESCryptoModule",
+ "app.comm.android.expo.HelloWorldModule"
+ ]
}
}
diff --git a/native/expo-modules/aes-crypto/ios/AESCryptoModule.swift b/native/expo-modules/comm-expo-package/ios/AESCryptoModule.swift
rename from native/expo-modules/aes-crypto/ios/AESCryptoModule.swift
rename to native/expo-modules/comm-expo-package/ios/AESCryptoModule.swift
diff --git a/native/ios/Podfile.lock b/native/ios/Podfile.lock
--- a/native/ios/Podfile.lock
+++ b/native/ios/Podfile.lock
@@ -1,6 +1,4 @@
PODS:
- - AESCrypto (0.0.1):
- - ExpoModulesCore
- boost (1.76.0)
- CommExpoPackage (0.0.1):
- ExpoModulesCore
@@ -568,7 +566,6 @@
- Yoga (1.14.0)
DEPENDENCIES:
- - AESCrypto (from `../expo-modules/aes-crypto/ios`)
- boost (from `../../node_modules/react-native/third-party-podspecs/boost.podspec`)
- CommExpoPackage (from `../expo-modules/comm-expo-package/ios`)
- DoubleConversion (from `../../node_modules/react-native/third-party-podspecs/DoubleConversion.podspec`)
@@ -675,8 +672,6 @@
- SPTPersistentCache
EXTERNAL SOURCES:
- AESCrypto:
- :path: "../expo-modules/aes-crypto/ios"
boost:
:podspec: "../../node_modules/react-native/third-party-podspecs/boost.podspec"
CommExpoPackage:
@@ -847,7 +842,6 @@
:path: "../../node_modules/react-native/ReactCommon/yoga"
SPEC CHECKSUMS:
- AESCrypto: 3f397599b6b8e66c3b8a16e09bed17e6ad03482d
boost: a7c83b31436843459a1961bfd74b96033dc77234
CommExpoPackage: 3f9d8a25537fb9d80f79a63fd1e73c51f55b87e9
DoubleConversion: 5189b271737e1565bdce30deb4a08d647e3f5f54
diff --git a/native/package.json b/native/package.json
--- a/native/package.json
+++ b/native/package.json
@@ -50,7 +50,6 @@
},
"dependencies": {
"@commapp/android-lifecycle": "0.0.1",
- "@commapp/aes-crypto": "0.0.1",
"@commapp/expo-package": "0.0.1",
"@commapp/sqlcipher-amalgamation": "^4.4.3-a",
"@commapp/thumbhash": "0.0.1",
diff --git a/package.json b/package.json
--- a/package.json
+++ b/package.json
@@ -10,7 +10,6 @@
"desktop",
"keyserver/addons/rust-node-addon",
"native/expo-modules/android-lifecycle",
- "native/expo-modules/aes-crypto",
"native/expo-modules/comm-expo-package",
"native/expo-modules/thumbhash",
"services/electron-update-server",

File Metadata

Mime Type
text/plain
Expires
Thu, Dec 5, 2:01 AM (13 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2614146
Default Alt Text
D7961.id27033.diff (8 KB)

Event Timeline