Skip to content

Commit

Permalink
Merge pull request #17 from dan0v/master
Browse files Browse the repository at this point in the history 
Update Ionic and Angular versions to latest
  • Loading branch information
@dan0v
dan0v authored Aug 16, 2023
2 parents bea27c4 + 830b943 commit 3eab7dc
Show file tree
Hide file tree
Showing 29 changed files with 4,009 additions and 13,244 deletions.
9 changes: 5 additions & 4 deletions filmemo/.browserslistrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,9 @@
# You can see what browsers were selected by your queries by running:
# npx browserslist

Chrome >=60
Firefox >=63
Chrome >=79
ChromeAndroid >=79
Firefox >=70
Edge >=79
Safari >=13
iOS >=13
Safari >=14
iOS >=14
1 change: 1 addition & 0 deletions filmemo/android/app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
apply plugin: 'com.android.application'

android {
namespace "io.ionic.starter"
compileSdkVersion rootProject.ext.compileSdkVersion
defaultConfig {
applicationId "io.ionic.starter"
Expand Down
4 changes: 2 additions & 2 deletions filmemo/android/app/capacitor.build.gradle
View file
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 Down
3 changes: 2 additions & 1 deletion filmemo/android/app/src/main/AndroidManifest.xml
View file
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="io.ionic.starter">
<manifest xmlns:android="http://schemas.android.com/apk/res/android" >

<application android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme">

Expand All @@ -22,4 +22,5 @@
<uses-permission android:name="android.permission.INTERNET"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
<uses-permission android:name="android.permission.READ_MEDIA_IMAGES"/>
</manifest>
4 changes: 2 additions & 2 deletions filmemo/android/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ buildscript {
mavenCentral()
}
dependencies {
classpath 'com.android.tools.build:gradle:7.2.1'
classpath 'com.google.gms:google-services:4.3.13'
classpath 'com.android.tools.build:gradle:8.0.0'
classpath 'com.google.gms:google-services:4.3.15'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down
3 changes: 1 addition & 2 deletions filmemo/android/gradle.properties
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Automatically convert third-party libraries to use AndroidX
android.enableJetifier=true

2 changes: 1 addition & 1 deletion filmemo/android/gradle/wrapper/gradle-wrapper.properties
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
20 changes: 10 additions & 10 deletions filmemo/android/variables.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
ext {
minSdkVersion = 22
compileSdkVersion = 32
targetSdkVersion = 32
androidxActivityVersion = '1.4.0'
androidxAppCompatVersion = '1.4.2'
compileSdkVersion = 33
targetSdkVersion = 33
androidxActivityVersion = '1.7.0'
androidxAppCompatVersion = '1.6.1'
androidxCoordinatorLayoutVersion = '1.2.0'
androidxCoreVersion = '1.8.0'
androidxFragmentVersion = '1.4.1'
coreSplashScreenVersion = '1.0.0-rc01'
androidxWebkitVersion = '1.4.0'
androidxCoreVersion = '1.10.0'
androidxFragmentVersion = '1.5.6'
coreSplashScreenVersion = '1.0.0'
androidxWebkitVersion = '1.6.1'
junitVersion = '4.13.2'
androidxJunitVersion = '1.1.3'
androidxEspressoCoreVersion = '3.4.0'
androidxJunitVersion = '1.1.5'
androidxEspressoCoreVersion = '3.5.1'
cordovaAndroidVersion = '10.1.1'
}
2 changes: 1 addition & 1 deletion filmemo/ios/.gitignore
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
App/build
App/Pods
App/Podfile.lock
App/App/public
DerivedData
xcuserdata
Expand All @@ -11,3 +10,4 @@ capacitor-cordova-ios-plugins
# Generated Config files
App/App/capacitor.config.json
App/App/config.xml

Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
Binary file removed filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/[email protected]
View file
Binary file not shown.
124 changes: 11 additions & 113 deletions filmemo/ios/App/App/Assets.xcassets/AppIcon.appiconset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -1,116 +1,14 @@
{
"images" : [
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "20x20",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "60x60",
"idiom" : "iphone",
"filename" : "[email protected]",
"scale" : "3x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"size" : "20x20",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"size" : "29x29",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"size" : "40x40",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "1x"
},
{
"size" : "76x76",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "83.5x83.5",
"idiom" : "ipad",
"filename" : "[email protected]",
"scale" : "2x"
},
{
"size" : "1024x1024",
"idiom" : "ios-marketing",
"filename" : "[email protected]",
"scale" : "1x"
"images" : [
{
"filename" : "[email protected]",
"idiom" : "universal",
"platform" : "ios",
"size" : "1024x1024"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
],
"info" : {
"version" : 1,
"author" : "xcode"
}
}
Loading

0 comments on commit 3eab7dc

Please sign in to comment.