Skip to content

Commit d2bae49

Browse files
committed
fix(android): plugin not building
brought back building (to test ) native libs on publish
1 parent 3802a30 commit d2bae49

Some content is hidden

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

42 files changed

+33
-4734
lines changed

Diff for: package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"plugin.watch.android": "npm i && npm-watch build.android",
1818
"plugin.watch.ios": "npm i && npm-watch build.ios",
1919
"plugin.watch": "npm run plugin.watch.tsc & npm run plugin.watch.android & npm run plugin.watch.ios",
20-
"publish": "ts-patch install && npm run build && lerna publish",
20+
"publish": "ts-patch install && npm run build.native && npm run build && lerna publish",
2121
"commitmsg": "commitlint -e $GIT_PARAMS"
2222
},
2323
"devDependencies": {

Diff for: plugin/platforms/android/include.gradle

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
dependencies {
2+
implementation "androidx.annotation:annotation:1.1.0"
3+
}

Diff for: plugin/platforms/android/java/com/akylas/canvas/CanvasPath.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import android.content.Context;
44

5-
import android.support.annotation.NonNull;
6-
import android.support.annotation.Nullable;
7-
import android.support.annotation.Size;
5+
import androidx.annotation.NonNull;
6+
import androidx.annotation.Nullable;
7+
import androidx.annotation.Size;
88

99
import android.util.Log;
1010

Diff for: src-native/android/.project

+11
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,15 @@
1414
<natures>
1515
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
1616
</natures>
17+
<filteredResources>
18+
<filter>
19+
<id>1599464117591</id>
20+
<name></name>
21+
<type>30</type>
22+
<matcher>
23+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
24+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
25+
</matcher>
26+
</filter>
27+
</filteredResources>
1728
</projectDescription>

Diff for: src-native/android/.settings/org.eclipse.buildship.core.prefs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ arguments=
22
auto.sync=false
33
build.scans.enabled=false
44
connection.gradle.distribution=GRADLE_DISTRIBUTION(WRAPPER)
5-
connection.project.dir=canvas
5+
connection.project.dir=
66
eclipse.preferences.version=1
77
gradle.user.home=
88
java.home=/Library/Java/JavaVirtualMachines/jdk1.8.0_141.jdk/Contents/Home

Diff for: src-native/android/canvas/.project

+11
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,15 @@
2020
<nature>org.eclipse.jdt.core.javanature</nature>
2121
<nature>org.eclipse.buildship.core.gradleprojectnature</nature>
2222
</natures>
23+
<filteredResources>
24+
<filter>
25+
<id>1599464117611</id>
26+
<name></name>
27+
<type>30</type>
28+
<matcher>
29+
<id>org.eclipse.core.resources.regexFilterMatcher</id>
30+
<arguments>node_modules|.git|__CREATED_BY_JAVA_LANGUAGE_SERVER__</arguments>
31+
</matcher>
32+
</filter>
33+
</filteredResources>
2334
</projectDescription>

Diff for: src-native/android/canvas/build.gradle

+1-10
Original file line numberDiff line numberDiff line change
@@ -113,16 +113,7 @@ artifacts {
113113
//}
114114

115115
dependencies {
116-
implementation fileTree(dir: 'libs', include: ['*.jar'])
117-
118-
implementation 'com.android.support:support-annotations:+'
119-
implementation 'com.android.support:appcompat-v7:27.1.1'
120-
testImplementation 'junit:junit:4.12'
121-
androidTestImplementation 'com.android.support.test:runner:1.0.2'
122-
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
123-
// implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
124-
// testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
125-
testImplementation 'org.testng:testng:6.9.6'
116+
implementation "androidx.annotation:annotation:1.1.0"
126117
}
127118
repositories {
128119
mavenCentral()

Diff for: src-native/android/canvas/src/main/java

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../../../../plugin/platforms/android/java

Diff for: src-native/android/canvas/src/main/java/com/akylas/canvas/CanvasPath.java

-89
This file was deleted.

Diff for: src-native/android/canvas/src/main/java/com/akylas/canvas/CanvasView.java

-28
This file was deleted.

Diff for: src-native/android/canvas/src/main/java/com/akylas/canvas/DrawListener.java

-6
This file was deleted.

Diff for: src-native/android/canvas/src/main/java/com/akylas/canvas/SizeChangedListener.java

-5
This file was deleted.

Diff for: src-native/ios/Canvas

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
../../plugin/platforms/ios/src

Diff for: src-native/ios/Canvas/BaseGeometry.h

-71
This file was deleted.

0 commit comments

Comments
 (0)