Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CU-8685z4x38 updating native projects and npm #9

Merged
merged 2 commits into from
Oct 12, 2023
Merged

CU-8685z4x38 updating native projects and npm #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ba1e03f
CU-8685z4x38 updating native projects and npm
ucswift Oct 12, 2023
8e27085
CU-8685z4x38 fixing rando build issue
ucswift Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion android/.idea/compiler.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions android/.idea/jarRepositories.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions android/.idea/kotlinc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion android/.idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 7 additions & 3 deletions android/app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
apply plugin: 'com.android.application'

android {
namespace "wtdt.resgrid.andriod"
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "wtdt.resgrid.andriod"
minSdkVersion rootProject.ext.minSdkVersion
targetSdkVersion rootProject.ext.targetSdkVersion
versionCode 1
versionName "1.0"
versionCode 99
versionName "1.99"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
aaptOptions {
// Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
Expand All @@ -30,14 +31,17 @@ repositories {
}

dependencies {
implementation "androidx.core:core-splashscreen:$coreSplashScreenVersion"
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$androidxAppCompatVersion"
implementation project(':capacitor-android')
testImplementation "junit:junit:$junitVersion"
implementation "androidx.coordinatorlayout:coordinatorlayout:$androidxCoordinatorLayoutVersion"
androidTestImplementation "androidx.test.ext:junit:$androidxJunitVersion"
androidTestImplementation "androidx.test.espresso:espresso-core:$androidxEspressoCoreVersion"
implementation project(':capacitor-cordova-android-plugins')
implementation "androidx.media:media:1.4.2"
implementation "androidx.annotation:annotation:1.2.0"
}

apply from: 'capacitor.build.gradle'
Expand Down
7 changes: 3 additions & 4 deletions android/app/capacitor.build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

android {
compileOptions {
sourceCompatibility JavaVersion.VERSION_11
targetCompatibility JavaVersion.VERSION_11
sourceCompatibility JavaVersion.VERSION_17
targetCompatibility JavaVersion.VERSION_17
}
}

Expand All @@ -28,8 +28,7 @@ dependencies {
implementation project(':capacitor-splash-screen')
implementation project(':capacitor-status-bar')
implementation project(':capawesome-capacitor-badge')
implementation project(':mozartec-capacitor-microphone')
implementation project(':capacitor-plugin-headset')
implementation project(':capacitor-plugin-resgrid')

}

Expand Down
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="wtdt.resgrid.andriod">
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
Expand Down
8 changes: 2 additions & 6 deletions android/app/src/main/assets/capacitor.plugins.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,11 +76,7 @@
"classpath": "io.capawesome.capacitorjs.plugins.badge.BadgePlugin"
},
{
"pkg": "@mozartec/capacitor-microphone",
"classpath": "com.mozartec.capacitor.microphone.MicrophonePlugin"
},
{
"pkg": "capacitor-plugin-headset",
"classpath": "com.resgrid.plugins.headset.HeadsetPlugin"
"pkg": "capacitor-plugin-resgrid",
"classpath": "com.resgrid.plugins.resgrid.ResgridPlugin"
}
]
7 changes: 2 additions & 5 deletions android/capacitor.settings.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,8 +59,5 @@ project(':capacitor-status-bar').projectDir = new File('../node_modules/@capacit
include ':capawesome-capacitor-badge'
project(':capawesome-capacitor-badge').projectDir = new File('../node_modules/@capawesome/capacitor-badge/android')

include ':mozartec-capacitor-microphone'
project(':mozartec-capacitor-microphone').projectDir = new File('../node_modules/@mozartec/capacitor-microphone/android')

include ':capacitor-plugin-headset'
project(':capacitor-plugin-headset').projectDir = new File('../node_modules/capacitor-plugin-headset/android')
include ':capacitor-plugin-resgrid'
project(':capacitor-plugin-resgrid').projectDir = new File('../node_modules/capacitor-plugin-resgrid/android')
Binary file modified android/gradle/wrapper/gradle-wrapper.jar
View file
Open in desktop
Binary file not shown.
5 changes: 2 additions & 3 deletions android/gradle/wrapper/gradle-wrapper.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#Mon Sep 05 16:41:56 PDT 2022
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
41 changes: 20 additions & 21 deletions ios/App/Podfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,27 +11,26 @@ install! 'cocoapods', :disable_input_output_paths => true
def capacitor_pods
pod 'Capacitor', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios'
pod 'CapacitorCommunityBackgroundGeolocation', :path => '..\..\node_modules\@capacitor-community\background-geolocation'
pod 'CapacitorCommunityBluetoothLe', :path => '..\..\node_modules\@capacitor-community\bluetooth-le'
pod 'CapacitorCommunityFileOpener', :path => '..\..\node_modules\@capacitor-community\file-opener'
pod 'CapacitorCommunityKeepAwake', :path => '..\..\node_modules\@capacitor-community\keep-awake'
pod 'CapacitorCommunitySqlite', :path => '..\..\node_modules\@capacitor-community\sqlite'
pod 'CapacitorApp', :path => '..\..\node_modules\@capacitor\app'
pod 'CapacitorCamera', :path => '..\..\node_modules\@capacitor\camera'
pod 'CapacitorDevice', :path => '..\..\node_modules\@capacitor\device'
pod 'CapacitorFilesystem', :path => '..\..\node_modules\@capacitor\filesystem'
pod 'CapacitorGeolocation', :path => '..\..\node_modules\@capacitor\geolocation'
pod 'CapacitorHaptics', :path => '..\..\node_modules\@capacitor\haptics'
pod 'CapacitorKeyboard', :path => '..\..\node_modules\@capacitor\keyboard'
pod 'CapacitorLocalNotifications', :path => '..\..\node_modules\@capacitor\local-notifications'
pod 'CapacitorNetwork', :path => '..\..\node_modules\@capacitor\network'
pod 'CapacitorPreferences', :path => '..\..\node_modules\@capacitor\preferences'
pod 'CapacitorPushNotifications', :path => '..\..\node_modules\@capacitor\push-notifications'
pod 'CapacitorSplashScreen', :path => '..\..\node_modules\@capacitor\splash-screen'
pod 'CapacitorStatusBar', :path => '..\..\node_modules\@capacitor\status-bar'
pod 'CapawesomeCapacitorBadge', :path => '..\..\node_modules\@capawesome\capacitor-badge'
pod 'MozartecCapacitorMicrophone', :path => '..\..\node_modules\@mozartec\capacitor-microphone'
pod 'CapacitorPluginHeadset', :path => '..\..\node_modules\capacitor-plugin-headset'
pod 'CapacitorCommunityBackgroundGeolocation', :path => '../../node_modules/@capacitor-community/background-geolocation'
pod 'CapacitorCommunityBluetoothLe', :path => '../../node_modules/@capacitor-community/bluetooth-le'
pod 'CapacitorCommunityFileOpener', :path => '../../node_modules/@capacitor-community/file-opener'
pod 'CapacitorCommunityKeepAwake', :path => '../../node_modules/@capacitor-community/keep-awake'
pod 'CapacitorCommunitySqlite', :path => '../../node_modules/@capacitor-community/sqlite'
pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app'
pod 'CapacitorCamera', :path => '../../node_modules/@capacitor/camera'
pod 'CapacitorDevice', :path => '../../node_modules/@capacitor/device'
pod 'CapacitorFilesystem', :path => '../../node_modules/@capacitor/filesystem'
pod 'CapacitorGeolocation', :path => '../../node_modules/@capacitor/geolocation'
pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics'
pod 'CapacitorKeyboard', :path => '../../node_modules/@capacitor/keyboard'
pod 'CapacitorLocalNotifications', :path => '../../node_modules/@capacitor/local-notifications'
pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network'
pod 'CapacitorPreferences', :path => '../../node_modules/@capacitor/preferences'
pod 'CapacitorPushNotifications', :path => '../../node_modules/@capacitor/push-notifications'
pod 'CapacitorSplashScreen', :path => '../../node_modules/@capacitor/splash-screen'
pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
pod 'CapawesomeCapacitorBadge', :path => '../../node_modules/@capawesome/capacitor-badge'
pod 'CapacitorPluginResgrid', :path => '../../node_modules/capacitor-plugin-resgrid'
end

target 'App' do
Expand Down
Loading