Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
# Conflicts:
#	build.gradle
#	okaspectj-plugin/build.gradle
#	repos/com/xtc/thomas/plugin/okaspectj-plugin/1.0.0/okaspectj-plugin-1.0.0.jar
#	repos/com/xtc/thomas/plugin/okaspectj-plugin/1.0.0/okaspectj-plugin-1.0.0.jar.md5
#	repos/com/xtc/thomas/plugin/okaspectj-plugin/1.0.0/okaspectj-plugin-1.0.0.jar.sha1
#	repos/com/xtc/thomas/plugin/okaspectj-plugin/maven-metadata.xml
#	repos/com/xtc/thomas/plugin/okaspectj-plugin/maven-metadata.xml.md5
#	repos/com/xtc/thomas/plugin/okaspectj-plugin/maven-metadata.xml.sha1
  • Loading branch information
TanZhiL committed Jan 24, 2021
2 parents 94ef9c2 + 20ce33a commit 8d9df47
Show file tree
Hide file tree
Showing 9 changed files with 46 additions and 0 deletions.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
7135fcb167bff3f30282a2c5f76ddee2
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
5558873a3dafca0ce3615f3050caf4b8b639d32c
28 changes: 28 additions & 0 deletions repos/upload/okaspectj-plugin/1.0.0/okaspectj-plugin-1.0.0.pom
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<modelVersion>4.0.0</modelVersion>
<groupId>upload</groupId>
<artifactId>okaspectj-plugin</artifactId>
<version>1.0.0</version>
<dependencies>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjrt</artifactId>
<version>1.8.14</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.aspectj</groupId>
<artifactId>aspectjtools</artifactId>
<version>1.8.6</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.android.tools.build</groupId>
<artifactId>gradle</artifactId>
<version>3.5.3</version>
<scope>runtime</scope>
</dependency>
</dependencies>
</project>
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
046136e0db455ea3162539840242d8e7
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
efbbce9f2164ff9819765f17d89528fb8b0396ce
12 changes: 12 additions & 0 deletions repos/upload/okaspectj-plugin/maven-metadata.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="UTF-8"?>
<metadata>
<groupId>upload</groupId>
<artifactId>okaspectj-plugin</artifactId>
<versioning>
<release>1.0.0</release>
<versions>
<version>1.0.0</version>
</versions>
<lastUpdated>20210124084857</lastUpdated>
</versioning>
</metadata>
1 change: 1 addition & 0 deletions repos/upload/okaspectj-plugin/maven-metadata.xml.md5
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3b38543ef4d3985c59a71ad0f480e27b
1 change: 1 addition & 0 deletions repos/upload/okaspectj-plugin/maven-metadata.xml.sha1
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
0372170d37ab463786a3fab463bf48125d6f3fcc

0 comments on commit 8d9df47

Please sign in to comment.