Skip to content

Commit b354b31

Browse files
committed
update CameraXVideo to compile in Android Studio Ladybug
1 parent e691ae0 commit b354b31

File tree

9 files changed

+253
-161
lines changed

9 files changed

+253
-161
lines changed

CameraXVideo/app/build.gradle

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,13 @@ apply plugin: 'kotlin-kapt'
2020
apply plugin: "androidx.navigation.safeargs"
2121

2222
android {
23-
compileSdkVersion 31
23+
namespace 'com.example.android.camerax.video'
24+
compileSdk 34
2425
defaultConfig {
2526
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2627
applicationId "com.android.example.camerax.video"
2728
minSdkVersion 21
28-
targetSdkVersion 31
29+
targetSdk 34
2930
versionCode 1
3031
versionName "1.0.0"
3132
}
@@ -48,7 +49,7 @@ android {
4849

4950
// Set the source of tests to same for both Unit and Instrumented tests
5051
sourceSets {
51-
String sharedTestDir = 'src/test/java'
52+
def sharedTestDir = 'src/test/java'
5253
test {
5354
java.srcDir sharedTestDir
5455
}

CameraXVideo/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,7 @@
1515
~ limitations under the License.
1616
-->
1717
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
18-
xmlns:tools="http://schemas.android.com/tools"
19-
package="com.example.android.camerax.video">
18+
xmlns:tools="http://schemas.android.com/tools">
2019

2120
<!-- Permission declarations -->
2221
<uses-permission android:name="android.permission.CAMERA" />

CameraXVideo/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
buildscript {
2020
// Top-level variables used for versioning
21-
ext.kotlin_version = '1.5.21'
21+
ext.kotlin_version = '2.1.10'
2222
ext.java_version = JavaVersion.VERSION_1_8
2323

2424
repositories {
2525
google()
2626
mavenCentral()
2727
}
2828
dependencies {
29-
classpath 'com.android.tools.build:gradle:7.2.2'
30-
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.10"
31-
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.4.1'
29+
classpath 'com.android.tools.build:gradle:8.5.2'
30+
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
31+
classpath 'androidx.navigation:navigation-safe-args-gradle-plugin:2.5.0'
3232

3333
// NOTE: Do not place your application dependencies here; they belong
3434
// in the individual module build.gradle files
@@ -42,6 +42,6 @@ allprojects {
4242
}
4343
}
4444

45-
task clean(type: Delete) {
45+
tasks.register("clean", Delete) {
4646
delete rootProject.buildDir
4747
}
-12.4 KB
Binary file not shown.

CameraXVideo/gradle/wrapper/gradle-wrapper.properties

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
#Wed Mar 31 21:04:32 PDT 2021
21
distributionBase=GRADLE_USER_HOME
32
distributionPath=wrapper/dists
3+
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
4+
networkTimeout=10000
5+
validateDistributionUrl=true
46
zipStoreBase=GRADLE_USER_HOME
57
zipStorePath=wrapper/dists
6-
distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip

0 commit comments

Comments
 (0)