Skip to content

Commit b9792c6

Browse files
migration of androidx till jni done
1 parent 09a5172 commit b9792c6

File tree

265 files changed

+4902
-3199
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+4902
-3199
lines changed

.DS_Store

2 KB
Binary file not shown.

ActivityLifecycle/androidx_migration.py

+1,975
Large diffs are not rendered by default.

ActivityLifecycle/app/build.gradle

+5-5
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ android {
2424

2525
dependencies {
2626
implementation fileTree(dir: 'libs', include: ['*.jar'])
27-
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
28-
implementation "com.android.support:appcompat-v7:$buildToolsVer"
29-
implementation "com.android.support.constraint:constraint-layout:$constraintLayoutVersion"
27+
implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
28+
implementation "androidx.appcompat:appcompat:$buildToolsVer"
29+
implementation "androidx.constraintlayout:constraintlayout:$constraintLayoutVersion"
3030
testImplementation "junit:junit:$junitVer"
31-
androidTestImplementation "com.android.support.test:runner:$androidTestRunnerVer"
32-
androidTestImplementation "com.android.support.test.espresso:espresso-core:$espressoCoreVersion"
31+
androidTestImplementation "androidx.test:runner:$androidTestRunnerVer"
32+
androidTestImplementation "androidx.test.espresso:espresso-core:$espressoCoreVersion"
3333
}

ActivityLifecycle/app/src/androidTest/java/com/developers/activitylifecycle/ExampleInstrumentedTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package com.developers.activitylifecycle
22

3-
import android.support.test.InstrumentationRegistry
4-
import android.support.test.runner.AndroidJUnit4
3+
import androidx.test.InstrumentationRegistry
4+
import androidx.test.runner.AndroidJUnit4
55

66
import org.junit.Test
77
import org.junit.runner.RunWith

ActivityLifecycle/app/src/main/java/com/developers/activitylifecycle/MainActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.developers.activitylifecycle
22

3-
import android.support.v7.app.AppCompatActivity
3+
import androidx.appcompat.app.AppCompatActivity
44
import android.os.Bundle
55
import java.util.logging.Logger
66

ActivityLifecycle/app/src/main/res/layout/activity_main.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto"
44
xmlns:tools="http://schemas.android.com/tools"
55
android:layout_width="match_parent"
@@ -15,4 +15,4 @@
1515
app:layout_constraintRight_toRightOf="parent"
1616
app:layout_constraintTop_toTopOf="parent" />
1717

18-
</android.support.constraint.ConstraintLayout>
18+
</androidx.constraintlayout.widget.ConstraintLayout>

ActivityLifecycle/gradle.properties

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
1212
org.gradle.jvmargs=-Xmx1536m
13-
13+
android.useAndroidX=true
14+
android.enableJetifier=true
1415
# When configured, Gradle will run in incubating parallel mode.
1516
# This option should only be used with decoupled projects. More details, visit
1617
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

AnimatedVectorDrawble/.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/build
2+
/.idea
3+
/local.properties
Binary file not shown.

AnimatedVectorDrawble/.idea/codeStyles/Project.xml

-25
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_annotation_annotation_1_0_0_jar.xml

-11
This file was deleted.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_appcompat_appcompat_1_0_2_aar.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_arch_core_core_runtime_2_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_asynclayoutinflater_asynclayoutinflater_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_constraintlayout_constraintlayout_1_1_3_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_coordinatorlayout_coordinatorlayout_1_0_0_aar.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_core_core_1_0_1_aar.xml

-15
This file was deleted.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_core_core_ktx_1_0_1_aar.xml

-12
This file was deleted.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_cursoradapter_cursoradapter_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_customview_customview_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_documentfile_documentfile_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_drawerlayout_drawerlayout_1_0_0_aar.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_fragment_fragment_1_0_0_aar.xml

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_interpolator_interpolator_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_ui_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_legacy_legacy_support_core_utils_1_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_2_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_livedata_core_2_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

AnimatedVectorDrawble/.idea/libraries/Gradle__androidx_lifecycle_lifecycle_runtime_2_0_0_aar.xml

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)