Skip to content
Extraits de code Groupes Projets
Sélectionner une révision Git
  • 9eceb47d0dd6fde0ddb7cf56f4c84e1f05d7a552
  • master par défaut protégée
  • dev
  • dev-admin
  • migration-pg
  • dev-partie
  • dev-deplacement-msg-erreurs
  • dev-jeux-favoris
  • dev-update-forms
  • dev-header-profil-deconnexion
  • dev-contact
  • dev_page_accueil
  • dev-edit-profil
  • dev-classement
  • dev_espace_membre
  • dev-images
  • javascript_valid_form
  • application_design_views
  • dev-table
  • dev-nestor
20 résultats

Router.php

Blame
  • fix.patch 6,18 Kio
    diff --git a/.idea/compiler.xml b/.idea/compiler.xml
    index 61a9130..fb7f4a8 100644
    --- a/.idea/compiler.xml
    +++ b/.idea/compiler.xml
    @@ -1,6 +1,6 @@
     <?xml version="1.0" encoding="UTF-8"?>
     <project version="4">
       <component name="CompilerConfiguration">
    -    <bytecodeTargetLevel target="1.8" />
    +    <bytecodeTargetLevel target="11" />
       </component>
     </project>
    \ No newline at end of file
    diff --git a/.idea/misc.xml b/.idea/misc.xml
    index d5d35ec..4700283 100644
    --- a/.idea/misc.xml
    +++ b/.idea/misc.xml
    @@ -1,6 +1,6 @@
     <?xml version="1.0" encoding="UTF-8"?>
     <project version="4">
    -  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
    +  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" project-jdk-name="1.8" project-jdk-type="JavaSDK">
         <output url="file://$PROJECT_DIR$/build/classes" />
       </component>
       <component name="ProjectType">
    diff --git a/app/build.gradle b/app/build.gradle
    index c38f927..7aba2de 100644
    --- a/app/build.gradle
    +++ b/app/build.gradle
    @@ -14,7 +14,7 @@ android {
             versionCode 1
             versionName "1.0"
     
    -        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
    +        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         }
     
         buildTypes {
    @@ -35,16 +35,12 @@ android {
     dependencies {
     
         implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
    -    //implementation 'com.android.support:appcompat-v7:28.0.0'
    -    implementation 'com.android.support.constraint:constraint-layout:2.0.4'
    +    implementation 'androidx.appcompat:appcompat:1.0.0'
    +    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
         implementation "androidx.recyclerview:recyclerview:1.1.0"
         implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
         implementation 'com.google.android.material:material:1.0.0'
         testImplementation 'junit:junit:4.+'
    -<<<<<<< HEAD
    -   // androidTestImplementation 'com.android.support.test:runner:1.0.2'
    -=======
    -    //androidTestImplementation 'com.android.support.test:runner:1.0.2'
    ->>>>>>> 36446a79a955a5ec115e137ca38bcb6976aede75
    -    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
    +    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
    +    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
     }
    \ No newline at end of file
    diff --git a/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
    index 4e9510b..7c19130 100644
    --- a/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
    +++ b/app/src/androidTest/java/com/clemhaowen/dm_td2/ExampleInstrumentedTest.kt
    @@ -1,7 +1,7 @@
     package com.clemhaowen.dm_td2
     
    -import android.support.test.InstrumentationRegistry
    -import android.support.test.runner.AndroidJUnit4
    +import androidx.test.InstrumentationRegistry