Skip to content

Commit 2099378

Browse files
committed
Migrate to AndroidX
1 parent 6d4702e commit 2099378

22 files changed

+147
-84
lines changed

.idea/compiler.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 3 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/jarRepositories.xml

Lines changed: 45 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 17 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/runConfigurations.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/build.gradle

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,25 +4,31 @@ android {
44
compileSdkVersion rootProject.ext.compileSdkVersion
55
defaultConfig {
66
applicationId "omega.com.omegalayoutsexample"
7-
minSdkVersion 14
7+
minSdkVersion 21
88
targetSdkVersion rootProject.ext.targetSdkVersion
99
versionCode 1
1010
versionName "1.0"
11-
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
11+
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
1212
}
1313
buildTypes {
1414
release {
1515
minifyEnabled false
1616
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1717
}
1818
}
19+
compileOptions {
20+
sourceCompatibility JavaVersion.VERSION_1_8
21+
targetCompatibility JavaVersion.VERSION_1_8
22+
}
1923
}
2024

2125
dependencies {
2226
implementation fileTree(dir: 'libs', include: ['*.jar'])
23-
implementation "com.android.support:appcompat-v7:$supportVersion"
2427
implementation project(":libs")
25-
testImplementation 'junit:junit:4.12'
26-
androidTestImplementation 'com.android.support.test:runner:1.0.1'
27-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
28+
29+
implementation 'androidx.appcompat:appcompat:1.5.1'
30+
31+
testImplementation 'junit:junit:4.13.2'
32+
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
33+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
2834
}

app/src/main/java/omega/com/omegalayoutsexample/AutoOrientationExampleActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.os.Bundle;
76

7+
import androidx.appcompat.app.AppCompatActivity;
8+
89
public class AutoOrientationExampleActivity extends AppCompatActivity {
910

1011
public static Intent createIntent(Context context) {

app/src/main/java/omega/com/omegalayoutsexample/MainActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
package omega.com.omegalayoutsexample;
22

3-
import android.support.v7.app.AppCompatActivity;
43
import android.os.Bundle;
54
import android.view.View;
65

6+
import androidx.appcompat.app.AppCompatActivity;
7+
78
public class MainActivity extends AppCompatActivity implements View.OnClickListener {
89

910
@Override

app/src/main/java/omega/com/omegalayoutsexample/PercentsExampleActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,10 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5-
import android.support.v7.app.AppCompatActivity;
65
import android.os.Bundle;
76

7+
import androidx.appcompat.app.AppCompatActivity;
8+
89
public class PercentsExampleActivity extends AppCompatActivity {
910

1011
public static Intent createIntent(Context context) {

app/src/main/java/omega/com/omegalayoutsexample/ShadowsExampleActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
import android.content.Context;
44
import android.content.Intent;
55
import android.os.Bundle;
6-
import android.support.v7.app.AppCompatActivity;
6+
7+
import androidx.appcompat.app.AppCompatActivity;
78

89
public class ShadowsExampleActivity extends AppCompatActivity {
910

0 commit comments

Comments
 (0)