Skip to content

Commit 4279e96

Browse files
SvetoslavTsenovSvetoslavTsenov
authored
Merge pull request #1378 from NativeScript/trifonov/android-x-only
feat: android X support only
2 parents edf706a + eeaf515 commit 4279e96

10 files changed

Lines changed: 45 additions & 90 deletions

File tree

‎build-artifacts/project-template-gradle/app/src/main/java/com/tns/NativeScriptApplication.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import android.app.Application;
44
import android.os.Build;
5-
import android.support.multidex.MultiDex;
5+
import androidx.multidex.MultiDex;
66

77
public class NativeScriptApplication extends Application {
88

‎build-artifacts/project-template-gradle/gradle.properties‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,3 +15,6 @@
1515
# Specifies the JVM arguments used for the daemon process.
1616
# The setting is particularly useful for tweaking memory settings.
1717
org.gradle.jvmargs=-Xmx16384M
18+
19+
android.enableJetifier=true
20+
android.useAndroidX=true

‎test-app/app/build.gradle‎

Lines changed: 19 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,10 @@
1212
*
1313
* -PtargetSdk=[target_sdk]
1414
* -PbuildToolsVersion=[build_tools_version]
15-
* -PsupportVersion=[support_version]
1615
* -PcompileSdk=[compile_sdk_version]
16+
* -PandroidXLegacy=[androidx_legacy_version]
17+
* -PandroidXAppCompat=[androidx_appcompat_version]
18+
* -PandroidXMaterial=[androidx_material_version]
1719
*/
1820

1921
import groovy.json.JsonSlurper
@@ -303,40 +305,27 @@ repositories {
303305
}
304306

305307
dependencies {
306-
def supportVer = "28.0.0"
307-
if (project.hasProperty("supportVersion")) {
308-
supportVer = supportVersion
308+
def androidXLegacyVersion = "1.0.0"
309+
if (project.hasProperty("androidXLegacy")) {
310+
androidXLegacyVersion = androidXLegacy
309311
}
310-
if (project.hasProperty("useAndroidX") && (useAndroidX || useAndroidX.toBoolean())) {
311-
def androidXLegacyVersion = "1.0.0"
312-
if (project.hasProperty("androidXLegacy")) {
313-
androidXLegacyVersion = androidXLegacy
314-
}
315-
316-
def androidXAppCompatVersion = "1.1.0-alpha01"
317-
if (project.hasProperty("androidXAppCompat")) {
318-
androidXAppCompatVersion = androidXAppCompat
319-
}
320312

321-
def androidXMaterialVersion = "1.1.0-alpha01"
322-
if (project.hasProperty("androidXMaterial")) {
323-
androidXMaterialVersion = androidXMaterial
324-
}
313+
def androidXAppCompatVersion = "1.1.0-alpha01"
314+
if (project.hasProperty("androidXAppCompat")) {
315+
androidXAppCompatVersion = androidXAppCompat
316+
}
325317

326-
println "\t + using andorid X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
318+
def androidXMaterialVersion = "1.1.0-alpha01"
319+
if (project.hasProperty("androidXMaterial")) {
320+
androidXMaterialVersion = androidXMaterial
321+
}
327322

328-
implementation "androidx.multidex:multidex:2.0.0"
329-
implementation "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
330-
implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
331-
implementation "com.google.android.material:material:$androidXMaterialVersion"
332-
} else {
333-
println "\t + using support library version $supportVer"
323+
println "\t + using andorid X library androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
334324

335-
implementation "com.android.support:multidex:1.0.2"
336-
implementation "com.android.support:support-v4:$supportVer"
337-
implementation "com.android.support:appcompat-v7:$supportVer"
338-
implementation "com.android.support:design:$supportVer"
339-
}
325+
implementation "androidx.multidex:multidex:2.0.0"
326+
implementation "androidx.legacy:legacy-support-v4:$androidXLegacyVersion"
327+
implementation "androidx.appcompat:appcompat:$androidXAppCompatVersion"
328+
implementation "com.google.android.material:material:$androidXMaterialVersion"
340329

341330
def useV8Symbols = false
342331

@@ -428,7 +417,6 @@ tasks.whenTaskAdded({ org.gradle.api.DefaultTask currentTask ->
428417
extractAllJars.finalizedBy(collectAllJars)
429418
}
430419
if (currentTask =~ /compile.+JavaWithJavac/) {
431-
currentTask.dependsOn(makeAndroidXChanges)
432420
currentTask.dependsOn(runSbg)
433421
currentTask.finalizedBy(ensureMetadataOutDir)
434422
ensureMetadataOutDir.finalizedBy(buildMetadata)
@@ -708,43 +696,6 @@ task buildMetadata(type: JavaExec) {
708696
}
709697
}
710698

711-
task makeAndroidXChanges {
712-
if (project.hasProperty("useAndroidX") && (useAndroidX || useAndroidX.toBoolean())) {
713-
// code changes
714-
def codeTuples = new ArrayList<Tuple2<String, String>>()
715-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.annotation\\.NonNull', 'androidx.annotation.NonNull'))
716-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.app\\.AppCompatActivity', 'androidx.appcompat.app.AppCompatActivity'))
717-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.appcompat\\.R', 'androidx.appcompat.R'))
718-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.design\\.widget\\.TabLayout', 'com.google.android.material.tabs.TabLayout'))
719-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.app\\.ActivityCompat', 'androidx.core.app.ActivityCompat'))
720-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.app\\.Fragment', 'androidx.fragment.app.Fragment'))
721-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.view\\.ViewPager', 'androidx.viewpager.widget.ViewPager'))
722-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.widget\\.Toolbar', 'androidx.appcompat.widget.Toolbar'))
723-
codeTuples.add(new Tuple2<String, String>('android\\.support\\.multidex\\.MultiDex', 'androidx.multidex.MultiDex'))
724-
725-
codeTuples.each { tuple ->
726-
ant.replaceregexp(match: tuple.first, replace: tuple.second, flags: 'g', byline: true) {
727-
fileset(dir: "$projectDir/src/debug/java/com/tns/", includes: '*.java')
728-
}
729-
ant.replaceregexp(match: tuple.first, replace: tuple.second, flags: 'g', byline: true) {
730-
fileset(dir: "$projectDir/src/main/java/com/tns/", includes: '*.java')
731-
}
732-
}
733-
734-
// resource changes
735-
def resourceTuples = new ArrayList<Tuple2<String, String>>()
736-
resourceTuples.add(new Tuple2<String, String>('android\\.support\\.v7\\.widget\\.Toolbar', 'androidx.appcompat.widget.Toolbar'))
737-
resourceTuples.add(new Tuple2<String, String>('android\\.support\\.v4\\.view\\.ViewPager', 'androidx.viewpager.widget.ViewPager'))
738-
resourceTuples.add(new Tuple2<String, String>('android\\.support\\.design\\.widget\\.TabLayout', 'com.google.android.material.tabs.TabLayout'))
739-
740-
resourceTuples.each { tuple ->
741-
ant.replaceregexp(match: tuple.first, replace: tuple.second, flags: 'g', byline: true) {
742-
fileset(dir: "$projectDir/src/debug/res/layout/", includes: 'error_activity.xml')
743-
}
744-
}
745-
}
746-
}
747-
748699
task generateTypescriptDefinitions(type: JavaExec) {
749700
if (!findProject(':dts-generator').is(null)) {
750701
dependsOn ':dts-generator:jar'

‎test-app/app/src/debug/java/com/tns/ErrorReport.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@
2525
import android.os.Build;
2626
import android.os.Bundle;
2727
import android.os.Environment;
28-
import android.support.design.widget.TabLayout;
29-
import android.support.v4.app.ActivityCompat;
30-
import android.support.v4.app.Fragment;
31-
import android.support.v4.app.FragmentManager;
32-
import android.support.v4.app.FragmentStatePagerAdapter;
33-
import android.support.v4.view.ViewPager;
34-
import android.support.v7.app.AppCompatActivity;
35-
import android.support.v7.widget.Toolbar;
28+
import com.google.android.material.tabs.TabLayout;
29+
import androidx.core.app.ActivityCompat;
30+
import androidx.fragment.app.Fragment;
31+
import androidx.fragment.app.FragmentManager;
32+
import androidx.fragment.app.FragmentStatePagerAdapter;
33+
import androidx.viewpager.widget.ViewPager;
34+
import androidx.appcompat.app.AppCompatActivity;
35+
import androidx.appcompat.widget.Toolbar;
3636
import android.text.method.ScrollingMovementMethod;
3737
import android.util.Log;
3838
import android.view.LayoutInflater;

‎test-app/app/src/debug/java/com/tns/ErrorReportActivity.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
import android.app.Application;
44
import android.os.Bundle;
5-
import android.support.annotation.NonNull;
6-
import android.support.v7.app.AppCompatActivity;
5+
import androidx.annotation.NonNull;
6+
import androidx.appcompat.app.AppCompatActivity;
77
import android.widget.Toast;
88

99
import java.lang.reflect.Method;
@@ -13,7 +13,7 @@
1313

1414
public class ErrorReportActivity extends AppCompatActivity {
1515
public void onCreate(Bundle savedInstanceState) {
16-
setTheme(android.support.v7.appcompat.R.style.Theme_AppCompat_NoActionBar);
16+
setTheme(androidx.appcompat.R.style.Theme_AppCompat_NoActionBar);
1717

1818
super.onCreate(savedInstanceState);
1919
Application app = this.getApplication();

‎test-app/app/src/debug/res/layout/error_activity.xml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,22 @@
77
tools:context="com.tns.ErrorReportActivity"
88
android:theme="@style/Widget.AppCompat.Light.ActionBar">
99

10-
<android.support.v7.widget.Toolbar
10+
<androidx.appcompat.widget.Toolbar
1111
android:id="@+id/toolbar"
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
1414
android:minHeight="?attr/actionBarSize"/>
1515

16-
<android.support.v4.view.ViewPager
16+
<androidx.viewpager.widget.ViewPager
1717
android:id="@+id/pager"
1818
android:layout_width="match_parent"
1919
android:layout_height="fill_parent"
2020
android:layout_below="@+id/toolbar"
2121
android:scrollbarAlwaysDrawVerticalTrack="false">
2222

23-
</android.support.v4.view.ViewPager>
23+
</androidx.viewpager.widget.ViewPager>
2424

25-
<android.support.design.widget.TabLayout
25+
<com.google.android.material.tabs.TabLayout
2626
android:id="@+id/tabLayout"
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"

‎test-app/build-tools/jsparser/tests/cases/decorated_extends_ts/app/myCustomActivity.android.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { setActivityCallbacks, AndroidActivityCallbacks } from "ui/frame";
22

33
@JavaProxy("org.nativescript.a.MyCustomActivity")
4-
class Activity extends android.support.v7.app.AppCompatActivity {
4+
class Activity extends androidx.appcompat.app.AppCompatActivity {
55
private _callbacks: AndroidActivityCallbacks;
66

77
protected onCreate(savedInstanceState: android.os.Bundle): void {

‎test-app/build-tools/jsparser/tests/cases/decorated_extends_ts/app/myCustomActivity_ts2.0.10.android.js‎

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

‎test-app/build-tools/jsparser/tests/cases/decorated_extends_ts/app/myCustomActivity_ts2.1.4.android.js‎

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

‎test-app/gradle.properties‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99

1010
# Specifies the JVM arguments used for the daemon process.
1111
# The setting is particularly useful for tweaking memory settings.
12-
# android.enableJetifier=true
13-
android.useAndroidX=true
1412
org.gradle.jvmargs=-Xmx1536m
1513

14+
android.enableJetifier=true
15+
android.useAndroidX=true
16+
1617
# When configured, Gradle will run in incubating parallel mode.
1718
# This option should only be used with decoupled projects. More details, visit
1819
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects

0 commit comments

Comments
 (0)