CCOM4030
/
kilometro0
Suivre 4
Favoriser 0
Bifurcation 0
Code Tickets 0 Demandes d'ajout 0 Versions 0 Wiki Activité
Parcourir la source

ready to start?

luis il y a 5 ans
Parent
d198970c71
révision
c7750ca5f1
14 fichiers modifiés avec 29 ajouts et 31 suppressions
Vue séparée Afficher les stats Diff
  1. 1
    1
      km0App/node_modules/android-versions/package.json
  2. 1
    1
      km0App/node_modules/array-ify/package.json
  3. 1
    1
      km0App/node_modules/compare-func/package.json
  4. 1
    1
      km0App/node_modules/cordova-android/package.json
  5. 1
    1
      km0App/node_modules/dot-prop/package.json
  6. 1
    1
      km0App/node_modules/is-obj/package.json
  7. 1
    1
      km0App/node_modules/properties-parser/package.json
  8. 1
    1
      km0App/node_modules/string.prototype.codepointat/package.json
  9. 2
    2
      km0App/package.json
  10. 7
    9
      km0App/platforms/android/CordovaLib/CordovaLib.iml
  11. 1
    1
      km0App/platforms/android/CordovaLib/build.gradle
  12. 9
    9
      km0App/platforms/android/app/app.iml
  13. 1
    1
      km0App/platforms/android/app/build.gradle
  14. 1
    1
      km0App/platforms/android/build.gradle

+ 1
- 1
km0App/node_modules/android-versions/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/android-versions/-/android-versions-1.5.0.tgz",
22 22 
   "_shasum": "7790bc74e0812aafd69fb1ad0cb4db4474a525d6",
23 23 
   "_spec": "android-versions@^1.4.0",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/cordova-android",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/cordova-android",
25 25 
   "author": {
26 26 
     "name": "dvoiss"
27 27 
   },

+ 1
- 1
km0App/node_modules/array-ify/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz",
22 22 
   "_shasum": "9e528762b4a9066ad163a6962a364418e9626ece",
23 23 
   "_spec": "array-ify@^1.0.0",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/compare-func",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/compare-func",
25 25 
   "author": {
26 26 
     "name": "Steve Mao",
27 27 
     "email": "maochenyan@gmail.com",

+ 1
- 1
km0App/node_modules/compare-func/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/compare-func/-/compare-func-1.3.2.tgz",
22 22 
   "_shasum": "99dd0ba457e1f9bc722b12c08ec33eeab31fa648",
23 23 
   "_spec": "compare-func@^1.3.2",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/cordova-android",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/cordova-android",
25 25 
   "author": {
26 26 
     "name": "Steve Mao",
27 27 
     "email": "maochenyan@gmail.com",

+ 1
- 1
km0App/node_modules/cordova-android/package.json Voir le fichier 

@@ -22,7 +22,7 @@
22 22 
   "_resolved": "https://registry.npmjs.org/cordova-android/-/cordova-android-8.1.0.tgz",
23 23 
   "_shasum": "d9aea62bbe4a4c8d22fdf21616869439cd1c95a0",
24 24 
   "_spec": "cordova-android@^8.0.0",
25 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App",
25 
+  "_where": "/home/luis/Software/kilometro0/km0App",
26 26 
   "author": {
27 27 
     "name": "Apache Software Foundation"
28 28 
   },

+ 1
- 1
km0App/node_modules/dot-prop/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz",
22 22 
   "_shasum": "1b708af094a49c9a0e7dbcad790aba539dac1177",
23 23 
   "_spec": "dot-prop@^3.0.0",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/compare-func",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/compare-func",
25 25 
   "author": {
26 26 
     "name": "Sindre Sorhus",
27 27 
     "email": "sindresorhus@gmail.com",

+ 1
- 1
km0App/node_modules/is-obj/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
22 22 
   "_shasum": "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f",
23 23 
   "_spec": "is-obj@^1.0.0",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/dot-prop",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/dot-prop",
25 25 
   "author": {
26 26 
     "name": "Sindre Sorhus",
27 27 
     "email": "sindresorhus@gmail.com",

+ 1
- 1
km0App/node_modules/properties-parser/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/properties-parser/-/properties-parser-0.3.1.tgz",
22 22 
   "_shasum": "1316e9539ffbfd93845e369b211022abd478771a",
23 23 
   "_spec": "properties-parser@^0.3.1",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/cordova-android",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/cordova-android",
25 25 
   "bugs": {
26 26 
     "url": "https://github.com/xavi-/node-properties-parser/issues"
27 27 
   },

+ 1
- 1
km0App/node_modules/string.prototype.codepointat/package.json Voir le fichier 

@@ -21,7 +21,7 @@
21 21 
   "_resolved": "https://registry.npmjs.org/string.prototype.codepointat/-/string.prototype.codepointat-0.2.1.tgz",
22 22 
   "_shasum": "004ad44c8afc727527b108cd462b4d971cd469bc",
23 23 
   "_spec": "string.prototype.codepointat@^0.2.0",
24 
-  "_where": "/Users/Luis/Documents/Universidad/Quinto Año (2019)/Software/km0/km0App/node_modules/properties-parser",
24 
+  "_where": "/home/luis/Software/kilometro0/km0App/node_modules/properties-parser",
25 25 
   "author": {
26 26 
     "name": "Mathias Bynens",
27 27 
     "url": "https://mathiasbynens.be/"

+ 2
- 2
km0App/package.json Voir le fichier 

@@ -26,8 +26,8 @@
26 26 
     },
27 27 
     "platforms": [
28 28 
       "ios",
29 
-      "android",
30 
-      "browser"
29 
+      "browser",
30 
+      "android"
31 31 
     ]
32 32 
   }
33 33 
 }

+ 7
- 9
km0App/platforms/android/CordovaLib/CordovaLib.iml Voir le fichier 

@@ -4,8 +4,8 @@
4 4 
     <facet type="android-gradle" name="Android-Gradle">
5 5 
       <configuration>
6 6 
         <option name="GRADLE_PROJECT_PATH" value=":CordovaLib" />
7 
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
8 
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
7 
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.0" />
8 
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.0" />
9 9 
       </configuration>
10 10 
     </facet>
11 11 
     <facet type="android" name="Android">
 
@@ -17,30 +17,28 @@
17 17 
           <task>generateDebugSources</task>
18 18 
         </afterSyncTasks>
19 19 
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
20 
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/debug" />
21 
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
22 20 
         <option name="PROJECT_TYPE" value="1" />
23 21 
       </configuration>
24 22 
     </facet>
25 23 
   </component>
26 24 
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
27 
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
28 
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
25 
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
26 
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
29 27 
     <exclude-output />
30 28 
     <content url="file://$MODULE_DIR$">
31 
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
29 
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
32 30 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
33 31 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
34 32 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
35 33 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
36 34 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
37 
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
35 
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
38 36 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
39 37 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
40 38 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
41 39 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
42 40 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
43 
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
41 
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
44 42 
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
45 43 
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
46 44 
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

+ 1
- 1
km0App/platforms/android/CordovaLib/build.gradle Voir le fichier 

@@ -31,7 +31,7 @@ buildscript {
31 31 
     dependencies {
32 32 
         // The gradle plugin and the maven plugin have to be updated after each version of Android
33 33 
         // studio comes out
34 
-        classpath 'com.android.tools.build:gradle:3.5.1'
34 
+        classpath 'com.android.tools.build:gradle:3.3.0'
35 35 
         classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1'
36 36 
         classpath 'com.jfrog.bintray.gradle:gradle-bintray-plugin:1.7.3'
37 37 
     }

+ 9
- 9
km0App/platforms/android/app/app.iml Voir le fichier 

@@ -4,8 +4,8 @@
4 4 
     <facet type="android-gradle" name="Android-Gradle">
5 5 
       <configuration>
6 6 
         <option name="GRADLE_PROJECT_PATH" value=":app" />
7 
-        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.5.1" />
8 
-        <option name="LAST_KNOWN_AGP_VERSION" value="3.5.1" />
7 
+        <option name="LAST_SUCCESSFUL_SYNC_AGP_VERSION" value="3.3.0" />
8 
+        <option name="LAST_KNOWN_AGP_VERSION" value="3.3.0" />
9 9 
       </configuration>
10 10 
     </facet>
11 11 
     <facet type="android" name="Android">
 
@@ -19,30 +19,30 @@
19 19 
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
20 20 
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
21 21 
         <option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
22 
-        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res;file://$MODULE_DIR$/build/generated/res/rs/debug" />
23 
-        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" />
22 
+        <option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
23 
+        <option name="TEST_RES_FOLDERS_RELATIVE_PATH" value="" />
24 24 
         <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
25 25 
       </configuration>
26 26 
     </facet>
27 27 
   </component>
28 28 
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
29 
-    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/classes" />
30 
-    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/classes" />
29 
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
30 
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
31 31 
     <exclude-output />
32 32 
     <content url="file://$MODULE_DIR$">
33 
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debug/out" isTestSource="false" generated="true" />
33 
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
34 34 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debug/compileDebugAidl/out" isTestSource="false" generated="true" />
35 35 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
36 36 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debug/compileDebugRenderscript/out" isTestSource="false" generated="true" />
37 37 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" generated="true" />
38 38 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" generated="true" />
39 
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugAndroidTest/out" isTestSource="true" generated="true" />
39 
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
40 40 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/aidl_source_output_dir/debugAndroidTest/compileDebugAndroidTestAidl/out" isTestSource="true" generated="true" />
41 41 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
42 42 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/renderscript_source_output_dir/debugAndroidTest/compileDebugAndroidTestRenderscript/out" isTestSource="true" generated="true" />
43 43 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" generated="true" />
44 44 
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" generated="true" />
45 
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/ap_generated_sources/debugUnitTest/out" isTestSource="true" generated="true" />
45 
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/test/debug" isTestSource="true" generated="true" />
46 46 
       <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
47 47 
       <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
48 48 
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />

+ 1
- 1
km0App/platforms/android/app/build.gradle Voir le fichier 

@@ -27,7 +27,7 @@ buildscript {
27 27 
     }
28 28
29 29 
     dependencies {
30 
-        classpath 'com.android.tools.build:gradle:3.5.1'
30 
+        classpath 'com.android.tools.build:gradle:3.3.0'
31 31 
     }
32 32 
 }
33 33

+ 1
- 1
km0App/platforms/android/build.gradle Voir le fichier 

@@ -28,7 +28,7 @@ buildscript {
28 28 
         // NOTE: Do not place your application dependencies here; they belong
29 29 
         // in the individual module build.gradle files
30 30
31 
-        classpath 'com.android.tools.build:gradle:3.5.1'
31 
+        classpath 'com.android.tools.build:gradle:3.3.0'
32 32 
     }
33 33 
 }
34 34