diff --git a/app/build.gradle b/app/build.gradle
index 922aebca..b4fa9d5d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -15,15 +15,19 @@
apply plugin : 'com.android.application'
+
android {
- compileSdkVersion 28
+ namespace "com.android.grafika"
+ compileSdk 33
defaultConfig {
applicationId "com.google.grafika"
minSdkVersion 14
- targetSdkVersion 28
+ targetSdkVersion 33
}
}
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 cbe64e85..a9d39015 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -24,6 +24,9 @@
+
-->
diff --git a/app/src/main/java/com/android/grafika/CameraCaptureActivity.java b/app/src/main/java/com/android/grafika/CameraCaptureActivity.java
index 522d1c85..741b6c0c 100644
--- a/app/src/main/java/com/android/grafika/CameraCaptureActivity.java
+++ b/app/src/main/java/com/android/grafika/CameraCaptureActivity.java
@@ -23,8 +23,8 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
import android.util.Log;
import android.view.Display;
import android.view.Surface;
diff --git a/app/src/main/java/com/android/grafika/ContinuousCaptureActivity.java b/app/src/main/java/com/android/grafika/ContinuousCaptureActivity.java
index 32d6f937..f16044df 100644
--- a/app/src/main/java/com/android/grafika/ContinuousCaptureActivity.java
+++ b/app/src/main/java/com/android/grafika/ContinuousCaptureActivity.java
@@ -22,7 +22,7 @@
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.Log;
import android.view.Display;
import android.view.Surface;
diff --git a/app/src/main/java/com/android/grafika/LiveCameraActivity.java b/app/src/main/java/com/android/grafika/LiveCameraActivity.java
index 6cf41fee..6c585fc6 100644
--- a/app/src/main/java/com/android/grafika/LiveCameraActivity.java
+++ b/app/src/main/java/com/android/grafika/LiveCameraActivity.java
@@ -20,7 +20,7 @@
import android.graphics.SurfaceTexture;
import android.hardware.Camera;
import android.os.Bundle;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import android.util.Log;
import android.view.Display;
import android.view.Surface;
diff --git a/app/src/main/java/com/android/grafika/PermissionHelper.java b/app/src/main/java/com/android/grafika/PermissionHelper.java
index d9e74c89..3e14bd9a 100644
--- a/app/src/main/java/com/android/grafika/PermissionHelper.java
+++ b/app/src/main/java/com/android/grafika/PermissionHelper.java
@@ -23,8 +23,8 @@
import android.content.pm.PackageManager;
import android.net.Uri;
import android.provider.Settings;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
import android.widget.Toast;
/**
diff --git a/app/src/main/java/com/android/grafika/ScreenRecordActivity.java b/app/src/main/java/com/android/grafika/ScreenRecordActivity.java
index c4918274..b42bbc8b 100644
--- a/app/src/main/java/com/android/grafika/ScreenRecordActivity.java
+++ b/app/src/main/java/com/android/grafika/ScreenRecordActivity.java
@@ -30,8 +30,8 @@
import android.os.Build;
import android.os.Bundle;
import android.os.Environment;
-import android.support.annotation.NonNull;
-import android.support.annotation.RequiresApi;
+import androidx.annotation.NonNull;
+import androidx.annotation.RequiresApi;
import android.util.DisplayMetrics;
import android.util.Log;
import android.view.Display;
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.properties b/gradle.properties
new file mode 100644
index 00000000..5465fec0
--- /dev/null
+++ b/gradle.properties
@@ -0,0 +1,2 @@
+android.enableJetifier=true
+android.useAndroidX=true
\ No newline at end of file
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