From 7e49f71c73876acfb0c3596471548fa2b04a4884 Mon Sep 17 00:00:00 2001 From: Mehdi Haghgoo Date: Tue, 7 Mar 2023 20:31:05 +0330 Subject: [PATCH 1/3] Update gradle and AGP --- app/build.gradle | 4 ++-- build.gradle | 8 +++++--- gradle/wrapper/gradle-wrapper.properties | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 922aebca..3429c91f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,11 +16,11 @@ apply plugin : 'com.android.application' android { - compileSdkVersion 28 + compileSdk 33 defaultConfig { applicationId "com.google.grafika" minSdkVersion 14 - targetSdkVersion 28 + targetSdkVersion 33 } } diff --git a/build.gradle b/build.gradle index 3eb903f0..08908c2c 100644 --- a/build.gradle +++ b/build.gradle @@ -18,16 +18,18 @@ buildscript { repositories { google() - jcenter() + mavenCentral() +// jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.0' + classpath 'com.android.tools.build:gradle:7.4.2' } } allprojects { repositories { google() - jcenter() + mavenCentral() +// jcenter() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 51e83a01..c119a231 100644 --- 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-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip From d0d1b9eb1d2619695b35268973f2759c84f7d48b Mon Sep 17 00:00:00 2001 From: Mehdi Haghgoo Date: Tue, 7 Mar 2023 21:55:16 +0330 Subject: [PATCH 2/3] Add namespace to build.gradle and set android:exported=true in manifest --- app/build.gradle | 2 ++ app/src/main/AndroidManifest.xml | 1 + gradle.properties | 2 ++ 3 files changed, 5 insertions(+) create mode 100644 gradle.properties diff --git a/app/build.gradle b/app/build.gradle index 3429c91f..f9206438 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,7 +15,9 @@ apply plugin : 'com.android.application' + android { + namespace "com.android.grafika" compileSdk 33 defaultConfig { applicationId "com.google.grafika" diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cbe64e85..4101ff93 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -33,6 +33,7 @@ diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 00000000..db40aa14 --- /dev/null +++ b/gradle.properties @@ -0,0 +1,2 @@ +#android.enableJetifier=true +#android.useAndroidX=true \ No newline at end of file From f5d4d180fb8679d79b4ce10c2814c30980026e29 Mon Sep 17 00:00:00 2001 From: Mehdi Haghgoo Date: Wed, 8 Mar 2023 01:23:27 +0330 Subject: [PATCH 3/3] Upgrade to AndroidX --- app/build.gradle | 4 +++- app/src/main/AndroidManifest.xml | 3 +++ .../main/java/com/android/grafika/CameraCaptureActivity.java | 4 ++-- .../java/com/android/grafika/ContinuousCaptureActivity.java | 2 +- app/src/main/java/com/android/grafika/LiveCameraActivity.java | 2 +- app/src/main/java/com/android/grafika/PermissionHelper.java | 4 ++-- .../main/java/com/android/grafika/ScreenRecordActivity.java | 4 ++-- gradle.properties | 4 ++-- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index f9206438..b4fa9d5d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -27,5 +27,7 @@ android { } dependencies { - implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'androidx.appcompat:appcompat:1.6.1' + implementation 'androidx.fragment:fragment:1.5.5' + implementation 'androidx.drawerlayout:drawerlayout:1.1.1' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4101ff93..a9d39015 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,6 +24,9 @@ +