+ bump SDK version

Maxime-Favier · Jan 18, 2023 · 67867a2 · 67867a2
1 parent af9b3ff
commit 67867a2
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 28 deletions.
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/php.xml b/.idea/php.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,15 +1,17 @@
+repositories {
+    mavenCentral()
+}
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "29.0.3"
-
+    //compileSdkVersion 31
+    compileSdk 33
     defaultConfig {
         applicationId "dev.favier.exam1radioamateur"
         minSdkVersion 22
-        targetSdkVersion 29
-        versionCode 9
-        versionName 'v0.9-beta'
+        targetSdkVersion 33
+        versionCode 11
+        versionName 'v0.11-beta'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -23,24 +25,25 @@ android {
             resValue("string", "DB_PASSWORD_PERSON", "pass")
         }*/
     }
+    namespace 'dev.favier.exam1radioamateur'
 }
 
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 
     //debugImplementation 'com.amitshekhar.android:debug-db:1.0.6'
-    def room_version = "2.2.5"
+    def room_version = '2.5.0'
     implementation 'com.google.android:flexbox:2.0.1'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation 'androidx.appcompat:appcompat:1.6.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.5'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.1'
     implementation "androidx.cardview:cardview:1.0.0"
     implementation "androidx.room:room-runtime:$room_version"
     annotationProcessor "androidx.room:room-compiler:$room_version"
-    implementation 'com.google.code.gson:gson:2.8.6'
+    implementation 'com.google.code.gson:gson:2.9.0'
 
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="dev.favier.exam1radioamateur"
           android:installLocation="auto">
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -13,41 +12,47 @@
             android:supportsRtl="true"
             android:theme="@style/AppTheme"
             >
-        <activity android:name=".CoursViewer">
+        <activity android:name=".CoursViewer" android:exported="false">
         </activity>
         <activity android:name=".QuestionsDownload"
-                  android:configChanges="keyboardHidden|orientation|screenSize">
+                  android:configChanges="keyboardHidden|orientation|screenSize"
+                  android:exported="false">
         </activity>
         <activity
                 android:name=".QuestionViewer"
                 android:label="@string/question"
                 android:configChanges="keyboardHidden|orientation|screenSize"
+                android:exported="false"
         />
         <activity
                 android:name=".ExamenResults"
                 android:label="@string/resultats"
-                android:configChanges="keyboardHidden|orientation|screenSize">
+                android:configChanges="keyboardHidden|orientation|screenSize"
+                android:exported="false">
 
         </activity>
         <activity
                 android:name=".OpenSource"
-                android:label="@string/opensource">
+                android:label="@string/opensource"
+                android:exported="false">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".MainActivity"/>
         </activity>
         <activity
                 android:name=".Remerciements"
-                android:label="@string/remerciement">
+                android:label="@string/remerciement"
+                android:exported="false">
             <meta-data
                     android:name="android.support.PARENT_ACTIVITY"
                     android:value=".MainActivity"/>
         </activity>
         <activity android:name=".ExamenActivity"
                   android:configChanges="keyboardHidden|orientation|screenSize"
+                  android:exported="false"
         >
         </activity>
-        <activity android:name=".MainActivity">
+        <activity android:name=".MainActivity" android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -366,6 +366,7 @@
                             android:layout_height="match_parent"/>
                 </TableLayout>
             </androidx.cardview.widget.CardView>
+
             <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="match_parent" android:layout_marginTop="5sp" android:paddingBottom="2sp"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -145,7 +145,7 @@
     <string name="gotoVideo">vidéos de F6KGL</string>
 
     <string name="newVersion">Nouveautés de la version</string>
-    <string name="nouvautés">* Maj de la base de question\n* Suppression du point négatif
+    <string name="nouvautés">* Maj de la base de question\n* MAJ du SDK Android
     </string>
 
     <string name="htmlCours">Cour HTML</string>

diff --git a/build.gradle b/build.gradle
@@ -8,7 +8,7 @@ buildscript {
 
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.1.3'
+        classpath 'com.android.tools.build:gradle:7.3.0'
 
 
         // NOTE: Do not place your application dependencies here; they belong

diff --git a/gradle.properties b/gradle.properties
@@ -16,5 +16,6 @@ org.gradle.jvmargs=-Xmx1536m
 # https://developer.android.com/topic/libraries/support-library/androidx-rn
 android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
-android.enableJetifier=true
+android.enableJetifier=false
+org.gradle.unsafe.configuration-cache=true
 
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-all.zip