Skip to content

Commit bfa6fe5

Browse files
author
Matthias Prost
authored
fix: error on login due to api (#24)
* fix: error on login due to api * fix: add package version updated in ios and package.json * fix: add more file and config for latest ios and android sdk
1 parent a31d993 commit bfa6fe5

35 files changed

+373
-292
lines changed

android/app/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
apply plugin: 'com.android.application'
22

33
android {
4+
namespace "com.matthiasprost.scalewaymanager"
45
compileSdkVersion rootProject.ext.compileSdkVersion
56
defaultConfig {
67
applicationId "com.matthiasprost.scalewaymanager"
78
minSdkVersion rootProject.ext.minSdkVersion
89
targetSdkVersion rootProject.ext.targetSdkVersion
9-
versionCode 20301
10-
versionName "2.3.1"
10+
versionCode 20313
11+
versionName "2.3.3"
1112
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1213
}
1314
buildTypes {

android/app/capacitor.build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
android {
44
compileOptions {
5-
sourceCompatibility JavaVersion.VERSION_1_8
6-
targetCompatibility JavaVersion.VERSION_1_8
5+
sourceCompatibility JavaVersion.VERSION_17
6+
targetCompatibility JavaVersion.VERSION_17
77
}
88
}
99

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.matthiasprost.scalewaymanager">
3+
>
44

55
<application
66
android:allowBackup="true"

android/build.gradle

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ buildscript {
77
mavenCentral()
88
}
99
dependencies {
10-
classpath 'com.android.tools.build:gradle:7.2.1'
11-
classpath 'com.google.gms:google-services:4.3.13'
10+
classpath 'com.android.tools.build:gradle:8.1.2'
11+
classpath 'com.google.gms:google-services:4.3.15'
1212

1313
// NOTE: Do not place your application dependencies here; they belong
1414
// in the individual module build.gradle files
@@ -28,3 +28,4 @@ task clean(type: Delete) {
2828
delete rootProject.buildDir
2929
}
3030

31+

android/gradle.properties

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,5 +20,4 @@ org.gradle.jvmargs=-Xmx1536m
2020
# Android operating system, and which are packaged with your app's APK
2121
# https://developer.android.com/topic/libraries/support-library/androidx-rn
2222
android.useAndroidX=true
23-
# Automatically convert third-party libraries to use AndroidX
2423
android.enableJetifier=true
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
distributionBase=GRADLE_USER_HOME
22
distributionPath=wrapper/dists
3-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-all.zip
44
zipStoreBase=GRADLE_USER_HOME
55
zipStorePath=wrapper/dists

android/variables.gradle

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
ext {
22
minSdkVersion = 22
3-
compileSdkVersion = 32
4-
targetSdkVersion = 32
5-
androidxAppCompatVersion = '1.4.2'
6-
androidxCoreVersion = '1.8.0'
7-
androidxMaterialVersion = '1.6.1'
8-
androidxBrowserVersion = '1.4.0'
3+
compileSdkVersion = 33
4+
targetSdkVersion = 33
5+
androidxAppCompatVersion = '1.6.1'
6+
androidxCoreVersion = '1.10.0'
7+
androidxMaterialVersion = '1.8.0'
8+
androidxBrowserVersion = '1.5.0'
99
androidxLocalbroadcastmanagerVersion = '1.0.0'
10-
androidxExifInterfaceVersion = '1.3.3'
11-
firebaseMessagingVersion = '23.0.5'
12-
playServicesLocationVersion = '20.0.0'
10+
androidxExifInterfaceVersion = '1.3.6'
11+
firebaseMessagingVersion = '23.1.2'
12+
playServicesLocationVersion = '21.0.1'
1313
junitVersion = '4.13.2'
14-
androidxJunitVersion = '1.1.3'
15-
androidxEspressoCoreVersion = '3.4.0'
14+
androidxJunitVersion = '1.1.5'
15+
androidxEspressoCoreVersion = '3.5.1'
1616
cordovaAndroidVersion = '10.1.1'
17-
androidxActivityVersion = '1.4.0'
17+
androidxActivityVersion = '1.7.0'
1818
androidxCoordinatorLayoutVersion = '1.2.0'
19-
androidxFragmentVersion = '1.4.1'
20-
coreSplashScreenVersion = '1.0.0-rc01'
21-
androidxWebkitVersion = '1.4.0'
19+
androidxFragmentVersion = '1.5.6'
20+
coreSplashScreenVersion = '1.0.0'
21+
androidxWebkitVersion = '1.6.1'
2222
}

ios/.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
App/build
66
App/Pods
77
App/public
8-
App/Podfile.lock
98
xcuserdata
109
DerivedData
1110

1211
# Cordova plugins for Capacitor
1312
capacitor-cordova-ios-plugins
1413

14+

ios/App/App.xcodeproj/project.pbxproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -347,14 +347,14 @@
347347
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
348348
CODE_SIGN_IDENTITY = "Apple Development";
349349
CODE_SIGN_STYLE = Automatic;
350-
CURRENT_PROJECT_VERSION = 2;
350+
CURRENT_PROJECT_VERSION = 1;
351351
DEVELOPMENT_TEAM = 8754A6XKT5;
352352
INFOPLIST_FILE = App/Info.plist;
353353
INFOPLIST_KEY_CFBundleDisplayName = "Scaleway Manager";
354354
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
355355
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
356356
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
357-
MARKETING_VERSION = 2.3.0;
357+
MARKETING_VERSION = 2.3.3;
358358
OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" \"-DDEBUG\"";
359359
PRODUCT_BUNDLE_IDENTIFIER = com.matthiasprost.scalewaymanager;
360360
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -372,14 +372,14 @@
372372
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
373373
CODE_SIGN_IDENTITY = "Apple Development";
374374
CODE_SIGN_STYLE = Automatic;
375-
CURRENT_PROJECT_VERSION = 2;
375+
CURRENT_PROJECT_VERSION = 1;
376376
DEVELOPMENT_TEAM = 8754A6XKT5;
377377
INFOPLIST_FILE = App/Info.plist;
378378
INFOPLIST_KEY_CFBundleDisplayName = "Scaleway Manager";
379379
INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.developer-tools";
380380
IPHONEOS_DEPLOYMENT_TARGET = 13.0;
381381
LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks";
382-
MARKETING_VERSION = 2.3.0;
382+
MARKETING_VERSION = 2.3.3;
383383
PRODUCT_BUNDLE_IDENTIFIER = com.matthiasprost.scalewaymanager;
384384
PRODUCT_NAME = "$(TARGET_NAME)";
385385
PROVISIONING_PROFILE_SPECIFIER = "";
-832 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)